Merge "Separate DTS-MA and DTS-UHD P2 to independent configs" am: a222e65f2e am: c30a909697

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

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