Merge "[automerger skipped] Revert "Decode the input of both setStream and setResource calls first" am: ade248a9bc -s ours" am: 3568a7a8c5 -s ours am: b4cced1f88 -s ours am: ea45ac7ede -s ours
am skip reason: Merged-In I9c401b4cbded8753fc89df25a2c4f88a2fe72087 with SHA-1 ac8151be84 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17061632
Change-Id: I1d01d2df9a49f20ca695753542179917a903f2c0
This commit is contained in: