Merge "Fix direct/offload thread output devices into MSD" am: 24c46f1741 am: 5f829dead3 am: 456051d0b9 am: 37a8cbea2e

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

Change-Id: I8a98b03c3733baec2252173aa245deda8c185747