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

[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: d5771108 -s ours am: 55613410 -s ours am: 8da95c29 -s ours am: 98b4b760 -s ours am: 21bdc69f -s ours am: 215229d8 -s ours

am skip reason: subject contains skip directive

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



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