Merge "Make GrantPermissionsActivity more null safe" into sc-dev am: a9b18f5539 am: 422c9487ac am: 1b89dcc3ef

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/15300792

Change-Id: If3c0673eb4d95282ab43f999db5357bbc5143d3d