[automerger skipped] DO NOT MERGE Hide overlay on KeyChainActivity am: cdca35442c -s ours am: ab48a7eab0 -s ours am: 0bf1c2c6d3 -s ours am: 7c15d8642a -s ours am: 7026c618a6 -s ours am: 0d46ce1c73 -s ours am: 6f8a533e39 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I343d67eab54b8b9043e417848007b7901a5af512