[automerger skipped] Merge changes from topics "dra", "dts_uhd" am: 6a1812c3...

[automerger skipped] Merge changes from topics "dra", "dts_uhd" am: 6a1812c3 am: ea8e392f am: 6e1398b5 -s ours

am skip reason: Merged-In Id6078e65941020a73f8a43017f480574c2a78999 with SHA-1 fb082f64 is already in history

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

Change-Id: If0edc0dc78c9de2852845f45f1611b10b69120f1