Merge "Decode the input of both setStream and setResource calls first" into sc-v2-dev am: c262621e01 am: 360a31df34

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16375868

Change-Id: Ib4fae153fa420ad892c60f55bff247e1d3a618ae