[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: ac8ca06f -s ours am: 41de6112 -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: I7e02e49a84bcaf6f9a4148020f1b814609335022
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>