[automerger skipped] Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first" am: 4c5f09ca am: 96c0c34f am: dcf263a2 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I267e9b2ec9d8fc2bf86af471ff420a8418ad93ce