Merge "DO NOT MERGE: Decode the input of both setStream and setResource calls first" into sc-dev am: 01fc465ef6

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

Change-Id: I2e7b409e538b8bf74ed885f93f9a223d8bd0343e