Merge "FingerprintService: refresh auth id after enroll and remove." into oc-dev am: d2915725d9
am: 567564a1b0

Change-Id: Ia1abaee42c84496c6318094216b63958087d15ff