Merge changes from topic "am-8aa3e7d6bc464a7ca8763f06d92f1c24" into rvc-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "DO NOT MERGE Make intents immutable" into oc-dev am: 1e8240d8 am: 53f1a99f am: 18b5a534 -s ours am: 0b212d65 -s ours am: a9f6ccf9 am: dae7a346 -s ours am: 6a2eb025 am: 1daf6dd2
  [automerger skipped] DO NOT MERGE Make intents immutable am: dba9823a am: 51ed0f97 am: e0862c05 -s ours am: 5b227475 -s ours am: c2407e7e am: 37ba307e -s ours am: e72846f5 am: 140e3357