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