[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 skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 98239c0d is already in history

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



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