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

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

Change-Id: I3fa3a565ab447078b78f268ca71feab6f11ddbdd