[automerger skipped] Merge "[DO NOT MERGE] Add FLAG_SECURE for ChooseLockPassword and Pattern" into tm-dev am: eaabdee25c am: 69c61a3a8e -s ours am: b088e86798 -s ours am: e1f877e7a6 -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>
This commit is contained in: