[automerger skipped] Merge "Revoke storage on SDK downgrade or new full...

[automerger skipped] Merge "Revoke storage on SDK downgrade or new full storage request" into rvc-dev am: b9e15c3f -s ours am: 83f12a47 -s ours am: d505cb71 -s ours

am skip reason: Change-Id Ia6bd5658b77a26ab15fea013ec875050457473e0 with SHA-1 b29834bc is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I501029cb368ab568299e0c4a385a36e66dd2e0f7