[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-qpr-dev am: 7a180dd7 am: eacb354e -s ours am: ce12969a -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8eaa05c8d055f060b54847eb114b0d1c6e3588f9