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

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

Change-Id: I4efc107ec69ac886a8408490d63c71a54f2b323d