Merge changes from topics "dra", "dts_uhd" am: 6a1812c30f am: ea8e392fef

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

Change-Id: I34f818f3140c8d5c6f21089bf168b6b836a61fbc