Merge "Merge "Make it clear that checking shouldShowPermissionRationale is...

Merge "Merge "Make it clear that checking shouldShowPermissionRationale is recommended" into rvc-dev am: 8083336a am: 93f09fac am: 218504d8" into rvc-qpr-dev-plus-aosp am: 02def46b

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

Change-Id: Ifce9a7bbe8d9a44be2c4b26d4992bf63a75d0e24