[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: 837b9d05 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I0f7b5674fae78221d409a7a0b33b082de41291c3