[automerger skipped] Merge "Revert "DO NOT MERGE: Decode the input of both...

[automerger skipped] Merge "Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first"" into rvc-dev am: 57095ccb am: 49a8f9eb -s ours am: c14fe55f -s ours am: 03f15493 -s ours am: c1ff156b -s ours

am skip reason: subject contains skip directive

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

Change-Id: I5a52aa8df7a36bafa80caf859e289c0b4242b144