Merge "PermissionRequest: Several updates am: b8f046bd am: 75c08889 am: c3bda93f" into nyc-mr2-dev-plus-aosp