[automerger skipped] Revert "DO NOT MERGE: Decode the input of both setStream...

[automerger skipped] Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first" am: b6509bdc am: 14bfa0cb -s ours am: 5336a5af -s ours am: 81a32d5e -s ours am: 4fc95f86 -s ours am: 2be97bbf -s ours am: d99f9e24 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I1ca634d0e29ec0a148519c89543751f5971ebcd8