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

Merge "Restore lost unlocked users after vold reset" into rvc-dev am: f9dcad0b am: 543d7e8c am: e466414c

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

Change-Id: Ida8e2d59c0950ef9a2d4a4142a8d10a515ef9e9d