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

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

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