[automerger skipped] Merge "Use device set for getDevicesForStream" into...

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

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

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

Change-Id: Ic781ec88dfd7061a288d2430947be8c0c5e15688