Merge "Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first"" into sc-dev am: 9edf1a71 am: 806633ad

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

Change-Id: I4eb770f4fc9d701021a127e5d6368d35fd3d5cd4