[automerger skipped] Merge "[DO NOT MERGE] Add FLAG_SECURE for...

[automerger skipped] Merge "[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-dev am: eaabdee2 am: 69c61a3a -s ours am: 600dcaa3 -s ours am: ae4b8500 -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: Ifb3ea6101bb48b418844feeca4bea998b2572056
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>