Merge "Fix some issues of the permission dialog" into rvc-dev am: cf035a376f am: 79351e09c7 am: 0b278ac1c9 am: 01a525287e am: 551cfb5d03

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

Change-Id: I068ff4a698d54df56cc391a358ff27c6086f5254