[automerger skipped] [DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern am: 27bddff2ac
-s ours am: ed094b353b
-s ours am: c5b9a0a392
-s ours am: 7bc9d083a3
-s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19961565 Change-Id: Iba92c4cf49d8864ea9a14b65763aab7205ac9dde Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: