Merge "Revoke storage on SDK downgrade or new full storage request" into qt-dev am: d035f1b9

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

Change-Id: Iab1bc49f9207d0758abb0221f4adf34a5769087e