Merge "[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern" into...

Merge "[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-dev am: eaabdee2

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



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