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

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

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