[automerger skipped] Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first" am: b6509bdc am: 14bfa0cb -s ours

am skip reason: subject contains skip directive

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

Change-Id: I59008a3b8e8a0e3ba8a04414cde129cffbd50637