[automerger skipped] Merge "Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first"" into sc-dev am: 9edf1a7140 am: 8e664172b8 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16630307

Change-Id: I0b715d72ec9097a14b8e9f5b8a7421429102c89b