Merge "Revoke storage on SDK downgrade or new full storage request" into rvc-dev am: b9e15c3f1a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idf46fcae18c9548c755ede7b402e1965c5cc26a3