[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 skip reason: subject contains skip directive

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



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