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