[automerger skipped] Merge "Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first"" into sc-dev am: 9edf1a7140 am: 806633ad66 -s ours am: e29216c56a -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16630307 Change-Id: I36de75214d668171d008b68cca0dd6f62f349c84
This commit is contained in: