[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: d95b7b49 -s ours

am skip reason: Merged-In Ia6bd5658b77a26ab15fea013ec875050457473e0 with SHA-1 53de4fdf is already in history

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

Change-Id: I412b0c8ffdcc409db8a2585edb0df53e248c856f