Merge changes from topic "am-a85250e295e945bc85257bc4ee11aa13" 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 qt-dev am: 13ad919f am: c4ee9df9 -s ours am: 95235208 -s ours am: 5c2e89e2 -s ours am: 25f8c85a -s ours am: 55ba19a4 -s ours am: aa41e08b -s ours
  [automerger skipped] Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first" am: b6509bdc am: 14bfa0cb -s ours am: 5336a5af -s ours am: 81a32d5e -s ours am: 4fc95f86 -s ours am: 2be97bbf -s ours am: d99f9e24 -s ours