Merge "Kill app if revoking a permission while resetting app prefs" into nyc-dev