Merge "Audio: Add ENCODING_DTS_HD_MA, ENCODING_DTS_UHD_P2" am: 7edaca37dd am: 41264808de

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1991785

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