Merge changes from topic "am-f18fb677b15e4dacac59d4a154406f6a" into sc-v2-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first"" into rvc-dev am: 57095ccb am: 83a82c49 -s ours am: 136021e2 -s ours am: f2c3d1e7 -s ours am: 9d63832c -s ours
  [automerger skipped] Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first" am: cc4fe898 am: 64479d2d -s ours am: eda5c147 -s ours am: 607c9533 -s ours am: 9214825d -s ours