[automerger skipped] [conflict] [DO NOT MERGE] Update window with FLAG_SECURE...

[automerger skipped] [conflict] [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing am: c561831a am: d78f1693 -s ours am: 4b70b75d -s ours am: feba47c3 -s ours am: 0d3f936b -s ours

am skip reason: subject contains skip directive

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



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