Merge "Fix SetupChooseLockPasswordTest" into tm-dev am: 8ba7ed6451 am: ba394bec83
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17347883 Change-Id: I8ace1f8f19841f659dfaa8427023acbace4ea237
This commit is contained in: