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