[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 skip reason: subject contains skip directive

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



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