[automerger skipped] Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into sc-v2-dev am: 7d5d1e2a48 -s ours am: 004cecaf9d -s ours am: 474ee1d8be -s ours am: 55165f3c0a -s ours am: 9a310b4820 -s ours

am skip reason: subject contains skip directive

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

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