Merge "Specify UID in getAuthenticatorIds" am: 47f27e64c0 am: f6bbf126d3

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

Change-Id: I1946e8847ac8a72a69664a8b8f1ffebc7ce0c0b4