Merge changes from topic "am-ff421f5c678447bf80a4adf729e40d01" into rvc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "[DO NOT MERGE] Make GlobalScreenshot PendingIntents immutable" into oc-dev am: d15b2f5b am: 0d82d9ff am: a4fbde56 -s ours am: b1b23547 -s ours am: 29802fb3 am: 378d3ae5 -s ours am: 8254a628 am: baf4c150 am: aa8904e1
  [automerger skipped] [DO NOT MERGE] Make GlobalScreenshot PendingIntents immutable am: 44124798 am: 40297a24 am: 368eecbe -s ours am: b20d5c3a -s ours am: f69d6cfb am: 0bf1c91f -s ours am: 435a7cd8 am: ecf2db45 am: fa6aefea