Merge changes from topic "am-6a80ad22a95146729ffb32509025cb72" into tm-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into tm-dev am: 7429f710 -s ours am: 3a28ab40 -s ours
  [automerger skipped] [automerged blank] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfde 2p: 353e9419 am: 9e76d2c1 -s ours am: 6cfd8c6a -s ours