[automerger skipped] Merge "Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first"" into qt-dev am: 13ad919ff5 am: c4ee9df900 -s ours am: 9523520806 -s ours am: 5c2e89e268 -s ours

am skip reason: subject contains skip directive

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

Change-Id: If81def7bc1defd58ffb6283dcda5cabc4a6e923d