[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: da52474c -s ours am: d38a74d2 -s ours am: 66a37b06 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4cc1d424edf9b50faac41fc54198543d96dd45f5