[automerger skipped] Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first" am: cc4fe8984a am: 64479d2daf -s ours am: eda5c14742 -s ours am: 607c953378 -s ours am: 9214825de2 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id433771112a8b37327c9d35d57b05ed9729f7ace