Merge cherrypicks of [18281033] into sc-qpr3-release. am: b2e956083b

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

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