Merge "Fix direct/offload thread output devices into MSD" am: 24c46f1741

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1340017

Change-Id: I9c3abaee9e70d0acf7dba5518caee8ae52bcde84