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

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

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