[automerger skipped] Merge Android U (ab/10368041) am: 547bb17f27 -s ours

am skip reason: Merged-In I1cdb2bb73b3f27eaee5e02c5291ef96f8d54a5a5 with SHA-1 7052829ba8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/24182592

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