Merge "Group additional DTS encodings under the surround sound settings" am: bfa4664c5d

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

Change-Id: I8f0ab6f1059d1f05f539afdd045cbc532b1c67c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>