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

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

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