Merge "Fix dialog leak in RequestPermissionActivity" into udc-dev am: 5b18837a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012490



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