[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and...

[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: 27bddff2 -s ours am: ed094b35 -s ours am: c5b9a0a3 -s ours am: 7f3518b9 -s ours am: 9ddbe829 -s ours

am skip reason: subject contains skip directive

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



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