[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: 25f8c85ab5 -s ours am: 55ba19a4af -s ours am: 00b18609fa -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ied4c8f3a96738a2f65cd8794b8e0a62f67fa9fd1