[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: b088e867 -s ours am: e1f877e7 -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: I1659051f07b742aeddf093a738ff8f3393b290a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>