Merge "Add UPGRADE_RUNTIME_PERMISSIONS permission to support testing." am: 602faa961a am: d6e6068ded

Change-Id: I115c7f8162298e448313ed13ac45f9ee6386194c