[automerger skipped] Merge "[DO NOT MERGE] Update window with FLAG_SECURE when...

[automerger skipped] Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into rvc-dev am: d7710fc3 am: 2fdf59ef -s ours am: 1702e5f4 -s ours am: 69194b04 -s ours am: 2127e8de -s ours

am skip reason: subject contains skip directive

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



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