Merge changes from topic "am-3c36ffd229534905a8da89295119690f" into tm-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into sc-v2-dev am: 7d5d1e2a -s ours am: 004cecaf -s ours am: 474ee1d8 -s ours
  [automerger skipped] [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing am: bcebd3e9 -s ours am: 32617848 -s ours am: 296ef9b3 -s ours