[automerger skipped] [automerged blank] [DO NOT MERGE] Add FLAG_SECURE for...

[automerger skipped] [automerged blank] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfde 2p: 353e9419 am: 9e76d2c1 -s ours am: 14584ec6 -s ours am: d9cc9813 -s ours am: f1e7e8ff -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19949403



Change-Id: I8ac735ecdab4c2210f902590b79a76db7adc7667
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>