Merge "Revert "Ensure compat storage grant is viewed as grant by dialog"" into...

Merge "Revert "Ensure compat storage grant is viewed as grant by dialog"" into udc-dev am: ddb094c5

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/22861143



Change-Id: I0c2403dd6847d908ade4ddf7e25e474cacebe849
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>