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: f11e1d35 am: fdc758e4

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

Change-Id: I9e2e35995b0ef9665170685383a4b8a34148aecb