[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: a627a5affe -s ours am: 5532623f9c -s ours am: da56be4c96 -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: Ife6b8fc74af0fe8dffda16d93e9b40a66fbe22d6