Merge "Use UIDFaker to ensure Credentials_test cleans up setting UID" am: 887cda5123 am: c40390f167 am: 60401ccd70

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2205516

Change-Id: I2560010758bc1c8a0017eddf2e7524c9a09a3adf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>