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

Merge "[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: 53875684 -s ours am: bc66d380 -s ours am: 93047c14 -s ours am: 9391e9be -s ours" into tm-d1-dev-plus-aosp