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