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

[automerger skipped] Merge "DO NOT MERGE: Decode the input of both setStream and setResource calls first" into sc-dev am: 01fc465e am: fc6a0401 am: 94a0e9bd -s ours

am skip reason: subject contains skip directive

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

Change-Id: I064640b0f42884c504632007d003a05a4fdb0cff