[automerger skipped] Audio: Add ENCODING_DTS_UHD am: bd3a68b6f1 am: d3b7c9bb9c am: e70b8644aa -s ours am: 89b13f19be -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: Ic4813ec4b264c6ea928dd9f3e0c92872124ec046
This commit is contained in: