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

Change-Id: Ic76f1ffd8ec2b954e9a2ebb6c326662a8d3ace0d