Merge "Add UPGRADE_RUNTIME_PERMISSIONS permission to support testing."