Merge changes from topic "presubmit-am-b3ba9bd7b2c9457694d3fdc81abd6a37" into sc-qpr1-dev
* changes: [automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfde [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern
Loading