Merge "Updates to Dolby Vision Levels" am: e7dd66d7db am: d1928adcae am: 498e2b7944

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

Change-Id: I621e97adabcd9ff2dc8b9ddabdb1684eaba3f55d