[automerger skipped] Revert "Decode the input of both setStream and...

[automerger skipped] Revert "Decode the input of both setStream and setResource calls first" am: ade248a9 -s ours am: cf9fb944 -s ours am: 9ee9ac6f -s ours am: 39fead47 -s ours am: 060a8af0 -s ours am: e5b80272 -s ours

am skip reason: Merged-In I9c401b4cbded8753fc89df25a2c4f88a2fe72087 with SHA-1 ac8151be is already in history

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

Change-Id: I51a56a923e30509b89754eb48d86ca471cbe44aa