[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 sc-dev am: d829ed59 -s ours am: 1f05e19f -s ours am: fab68f3c -s ours am: 3e146fac -s ours am: 15c05ae0 -s ours am: 36c38d6c -s ours am: 43113d8f -s ours

am skip reason: subject contains skip directive

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



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