[automerger skipped] Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first" am: cc4fe898 am: 64479d2d -s ours am: eda5c147 -s ours am: eb07af56 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id49f09c12752a1746d0b13b8e51e328ba589c8ff