[automerger skipped] DO NOT MERGE: Decode the input of both setStream and...

[automerger skipped] DO NOT MERGE: Decode the input of both setStream and setResource calls first am: fa9c7397 am: 3b44a185 -s ours am: fd6b42db -s ours am: 1d49df75 -s ours am: e68b30a2 -s ours am: 9f9bf3e6 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I39c5be340dfac64dee07b257514105b8095ee06a