[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: c2188d60 -s ours am: 5e154e8d -s ours am: c47c8f1b -s ours am: 712a05c3 -s ours am: bf23a64d -s ours am: 862c1c87 -s ours am: cff660f9 -s ours am: 1522ae8d -s ours am: d5eb9e73 -s ours

am skip reason: subject contains skip directive

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

Change-Id: If326ff66664a93f6d21cb98e630f1fb296a73472