Skip group if recreating GrantPermissionsActivity after returning

If we're recreating a GrantPermissionsActivity, and we are restoring
Activity state, and we would send the user directly to settings, assume
the activity was killed while the user was in settings, and skip the
group

Fixes: 275630677
Test: manual
Change-Id: Ifd1203722fc6c698ca7de48ec465ef1355b97fde