[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 qt-dev am: d035f1b9 am: dcbef79e -s ours am: 13045916 -s ours am: 21dad0f3 -s ours am: 04d15d41 -s ours

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

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

Change-Id: I32bff5599876f851a75780a63e66b8707c9d660d