[automerger skipped] Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first" am: cc4fe8984a am: 38cd0a81dd -s ours am: c4fafb31a6 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I3c9aca7924650cfc8e6176e6b5941aa81c090b08