[automerger skipped] DO NOT MERGE: Decode the input of both setStream and setResource calls first am: fa9c73975e am: ab3c7eb753 -s ours am: fe082e2419 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7e00a2f4fc1bc97b1d8a1ee622b5e9559055a0c7