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

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

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