[automerger skipped] Merge "Use UIDFaker to ensure Credentials_test cleans up setting UID" am: 887cda5123 am: c40390f167 am: 60401ccd70 am: b69796b74f am: d3f7e91a19 -s ours

am skip reason: Merged-In I515f802aaedf1ea3dfc345af54e4d7383335bbb7 with SHA-1 c73be48cb3 is already in history

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

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