Merge "AudioTrack: 24 channel index masks, compressed formats" am: e477e9686f am: dd8fa96c01

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

Change-Id: I35427c5ce3826841b1a0d313ba2488e2bc03fb3b