[automerger skipped] Audio: Add ENCODING_DTS_UHD am: bd3a68b6f1 am: d3b7c9bb9c am: e70b8644aa -s ours

am skip reason: Merged-In I740a9ba041ad444ead5513fb3b632a78d391ab1c with SHA-1 e73976dba6 is already in history

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

Change-Id: If8e96aac78708e70e5ce5d21c71c9214ef64878d