[automerger skipped] Merge "Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first"" into rvc-dev am: 57095ccbeb am: 83a82c4919 -s ours am: 136021e23d -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16631185 Change-Id: I08a2446bef1e13d8e379e6d93715da98be72ca91
This commit is contained in: