[automerger skipped] Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first" am: cc4fe8984a am: 38cd0a81dd -s ours am: c4fafb31a6 -s ours am: aa63ae33c9 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I25f71955a56781492557b22741b1eb6133db0ee6