[automerger skipped] Merge "Specify UID in getAuthenticatorIds" am: 47f27e64...

[automerger skipped] Merge "Specify UID in getAuthenticatorIds" am: 47f27e64 am: f6bbf126 am: 0506e4eb -s ours am: a9f72d30 -s ours

am skip reason: Merged-In I0eef28ecefb85f1c10a73a354d08c38087d59814 with SHA-1 91bb4412 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687049

Change-Id: I161d6275654ac13ec0b7117132b14af4cac0e9a7