[automerger skipped] [automerged blank] [DO NOT MERGE] Add FLAG_SECURE for...

[automerger skipped] [automerged blank] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern 2p: 98e3bfde 2p: 353e9419 am: 9e76d2c1 -s ours am: 14584ec6 -s ours

am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 d5771108 is already in history

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



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