[automerger skipped] Merge "Revert "DO NOT MERGE: Decode the input of both...

[automerger skipped] Merge "Revert "DO NOT MERGE: Decode the input of both setStream and setResource calls first"" into rvc-dev am: 57095ccb am: 83a82c49 -s ours am: 136021e2 -s ours am: f2c3d1e7 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I49a4a053e3219ae640bef3e3b3c4da6861607008