[automerger skipped] Merge "Add UPGRADE_RUNTIME_PERMISSIONS permission to support testing." am: 602faa961a am: d6e6068ded am: 49e859cfed -s ours
am skip reason: Change-Id I7e40296120e18f2dfbbf04b5ae9d148724afa920 with SHA-1 934fbdbf05 is in history

Change-Id: Id19b7c2de8249eeaf5345ce316de7f3dc262afc4