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

Merge "[automerger skipped] Revert "Decode the input of both setStream and setResource calls first" am: ade248a9 -s ours" am: 3568a7a8 -s ours am: b4cced1f -s ours am: ea45ac7e -s ours am: 466ad68c -s ours

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

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

Change-Id: I0c1100b9d15c3ca4190e652b29e1193065ea2826