[automerger skipped] Merge "Merge "Send callingUserId from AuthService -> BiometricServiceBase" into rvc-dev am: 20534dcc8d am: 9710f8eaab" into rvc-d1-dev-plus-aosp am: bade9fa7d9 -s ours
am skip reason: Change-Id I4ec89b9cb13caff397b1a1acd844962736290040 with SHA-1 5433cd4070 is in history
Change-Id: Icd8fdda9f97e0bf56a28085f97a0e8e3b95905ee
This commit is contained in: