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