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

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

Change-Id: I0d1cdf39105ca4f3ade228d25131210dc21bfe73