Merge "Restore lost unlocked users after vold reset" into rvc-dev am: f9dcad0b12 am: 8e6eb848f6 am: 0dce55ecb8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11920286 Change-Id: I767ee3132b83cc6b100f44371a89492a17243858
This commit is contained in: