[automerger skipped] Merge 10952656 am: 6da1906643 -s ours

am skip reason: Merged-In I99ad17cdfa0324e623b4674332922c8bf2db263e with SHA-1 1fd1f257fa is already in history

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

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