[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 qt-dev am: 2663e8aa am: 4f404a50 -s ours am: 974a8471 -s ours am: e32da18b -s ours am: 0b21b97d -s ours

am skip reason: subject contains skip directive

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



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