[automerger skipped] DO NOT MERGE: Decode the input of both setStream and setResource calls first am: fa9c73975e am: 3b44a185d6 -s ours am: fd6b42db79 -s ours am: 1d49df75eb -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6e4b81130b4111f09c9d4563a67174cfe741cda1