[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: 23e9e62a am: 9c3b6ef6 -s ours am: f0bc03a3 -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: I14341867c73c2510bb1c09959199effa0f57bfaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>