[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: d6b7661b am: 6e55e052 -s ours am: d584c0c6 -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: I830646fad97feb1628a2dca3b5e5c4ead604fd27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>