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: 482cb2fa" into rvc-qpr-dev-plus-aosp am: 57aba848

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

Change-Id: I9c5566c5541739e4f1288f232da68aebd22edb5f