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

[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: aac79b89 am: 1ec2b21d -s ours am: a78ad20f -s ours am: 8611757c -s ours

am skip reason: subject contains skip directive

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



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