Merge "Enable lockUserTest" into tm-dev am: 231efa0937 am: 4a473b5476
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17128403 Change-Id: I77b77c5303d59b94382fed8fcadb8e369ba65d14
This commit is contained in: