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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I350025235e34593c01c3e87f1340832ae99b24be