[automerger skipped] Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first" am: b6509bdc18 am: 14bfa0cbd0 -s ours am: 5336a5afbb -s ours am: 81a32d5eb5 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16630308 Change-Id: Ida7fb9ede86913b6013b53bfc14e43ad566c304b
This commit is contained in: