[automerger skipped] Merge "Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first"" into sc-dev am: 9edf1a7140 am: 806633ad66 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I8b633eb95ad8da082ba5ea999a71b453345e0b1b