[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: 5ce8479b -s ours am: 14985d3e -s ours am: b4e4fabe -s ours am: dd398d36 -s ours am: 2a8f7a9f -s ours

am skip reason: subject contains skip directive

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

Change-Id: I07239d828a451016958325f07e5565a39b008065