[automerger skipped] Merge "Dismiss the dialog in onDestroy method in PermissionActivity" into mainline-prod am: 048ba5c57f -s ours

am skip reason: Change-Id I89d5ad21c81f999abf77397ec65b45dc8be717e0 with SHA-1 77d48bf4d9 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/13155680

Change-Id: Ia0c7929b584d5b4989674654781f113ab8dc08e8