[automerger skipped] Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first" am: b6509bdc18 am: 14bfa0cbd0 -s ours am: 5336a5afbb -s ours am: 81a32d5eb5 -s ours am: 4fc95f8684 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I72e0ed752094cb5727bd1b4669743fac5ed49193