Merge "Merge "Restore lost unlocked users after vold reset" into rvc-dev am:...

Merge "Merge "Restore lost unlocked users after vold reset" into rvc-dev am: f9dcad0b am: 8e6eb848 am: 0dce55ec" into rvc-qpr-dev-plus-aosp am: b2cfe305

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11920286

Change-Id: I67ab8c9db8ec26cc0a7974f2426df1b6c5f7ce6d