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

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

Change-Id: I1c11e54398127996461a60f4572adbed0f2add0f