Merge "Make it clear that checking shouldShowPermissionRationale is recommended" into rvc-dev am: 8083336a88

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

Change-Id: I3b86d4957f0cdd609575b54ec27d1ae576da421d