[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: 4d91b5aa am: 6910c877 -s ours am: 87bdfa2e -s ours am: d6e95039 -s ours am: d2a77206 -s ours am: e4ad87bb -s ours am: fc06cb86 -s ours am: 33fe36ad -s ours

am skip reason: subject contains skip directive

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

Change-Id: I07997fd79ac849b20fb1466cd6ab0d859dc8ea45