[automerger skipped] [automerge] [DO NOT MERGE] Add FLAG_SECURE for...

[automerger skipped] [automerge] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfde am: 3f027703 -s ours am: fcffcdd6 -s ours am: 34d43eb7 -s ours am: c6700934 -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: Ia7986779a2bc1cc0c2ff293af90593561fbeba6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>