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

[automerger skipped] Merge "Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first"" into qt-dev am: 13ad919f am: c4ee9df9 -s ours am: 95235208 -s ours am: 5c2e89e2 -s ours am: 25f8c85a -s ours am: 55ba19a4 -s ours am: aa41e08b -s ours am: 5fba92d1 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I5437df6817f5e5ea9edafd490ac662f8585233e1