Merge changes from topic "presubmit-am-f6e370c18f884421aaaa04b79ce77487" into sc-qpr1-dev am: d3e1a27e1a

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

Change-Id: Ifaf4677b23162703ba50e1f110aaa4f0773df0fd