Merge "Specify UID in getAuthenticatorIds" am: 47f27e64c0

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

Change-Id: I9b81131c4f59d6855c83947003f70e59ab818f6f