[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: 6a6a36aa -s ours am: e14cbc8d -s ours am: afc54eea -s ours am: c3ec9c12 -s ours am: 0f95fcd1 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I0258a0ebb251b3c86e50d41486d6c2202c02ece7