Merge "Merge "Forget volumes that have been freshly formatted." into rvc-dev...

Merge "Merge "Forget volumes that have been freshly formatted." into rvc-dev am: 2ad10d0d" into rvc-dev-plus-aosp am: a110d97b am: a82a9a47 am: 7dfabd54

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

Change-Id: If1a3a2af36cd7f5a0045b96286cd2b268804d5c2