[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 skip reason: subject contains skip directive

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

Change-Id: I6bce42f29193a6ee7958c15dbe504764ba9e11e1