[automerger skipped] Revert "Decode the input of both setStream and...

[automerger skipped] Revert "Decode the input of both setStream and setResource calls first" am: ade248a9 -s ours am: c0a14033 -s ours am: 4f78bcb2 -s ours

am skip reason: Merged-In I9c401b4cbded8753fc89df25a2c4f88a2fe72087 with SHA-1 aba1d77f is already in history

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

Change-Id: Id5c07b0972823a6f8babd7915ea9e04ccd34cd0d