Merge "RuntimePermissionUsageInfo.getName() now returns a String."