[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 sc-dev am: 9edf1a71 am: 806633ad -s ours am: e29216c5 -s ours am: 83d9efeb -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4ecf9af5b6479ad45c0b1430faabfbf14f8683ee