[automerger skipped] Merge "DO NOT MERGE: Decode the input of both setStream and setResource calls first" into sc-dev am: 01fc465ef6 am: fc6a04010f -s ours am: 5852813e6c -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16375906 Change-Id: Ib5f0ea95d428160bcc8aac9aac6e25867df4db19
This commit is contained in: