Merge "Remove only selected messages for vold reset" into rvc-dev am:...

Merge "Remove only selected messages for vold reset" into rvc-dev am: df13a636 am: 95f2a9be am: b3fcdaa6

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

Change-Id: Ida599754c95ae903dfec75bc02ae325242ff5ca4