[automerger skipped] Merge "Use device set for getDevicesForStream" into tm-dev am: c640ee83 am: eada8716 -s ours

am skip reason: Merged-In Id382172f44f604de659de0bff52c0a28603d1e79 with SHA-1 b11e4c74 is already in history

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

Change-Id: I90681b036276569b850035ec3e88e6280b075c51