[automerger skipped] Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first" am: 4c5f09cab3 am: 96c0c34fb9 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16630307 Change-Id: I2b9588b8f8da5281f40d3b32aca41651bd172676
This commit is contained in: