[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: cc4fe898 am: 64479d2d -s ours am: eda5c147 -s ours am: 607c9533 -s ours am: 96a7b3af -s ours am: 707fb462 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I50a5aa29a3837d509b49d8076b3cb12c826edecf