Merge changes from topic "am-cdd05b0d831a4f848fe15cc2a4aaf5cc"

* changes:
  [automerger skipped] Merge "[DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing" into rvc-dev am: d7710fc3 am: 2fdf59ef -s ours am: 1702e5f4 -s ours am: ea27062d -s ours am: 33252b72 -s ours am: 48326051 -s ours am: 19257422 -s ours am: e570be64 -s ours am: c81250b6 -s ours am: 6d6338c5 -s ours
  [automerger skipped] [DO NOT MERGE] Update window with FLAG_SECURE when bouncer is showing am: bc214696 am: dc0ba857 -s ours am: 5820c126 -s ours am: ed5079e9 -s ours am: 4d41bd1e -s ours am: cf5a9761 -s ours am: 2792c61b -s ours am: 603b7943 -s ours am: d12aaf65 -s ours am: 8f257653 -s ours