[automerger skipped] Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first" am: cc4fe898 am: 38cd0a81 -s ours am: c4fafb31 -s ours am: aa63ae33 -s ours am: 9670be3d -s ours am: 137d773e -s ours

am skip reason: subject contains skip directive

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

Change-Id: I634f6281c087e693c32b720b975a768cb8ac2bf9