[automerger skipped] [automerge] [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing 2p: 18ddad1f5a am: bd1f3638e8 -s ours am: 25a05a2530 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17637345

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