[automerger skipped] Merge "Merge "Do not use content light level if it's 0"...

[automerger skipped] Merge "Merge "Do not use content light level if it's 0" into rvc-dev am: 1bb400d7 am: a3f5360e" into rvc-d1-dev-plus-aosp am: d1868faa -s ours am: 6e217399 -s ours

am skip reason: Change-Id I6764623130f839df83fd6f5db1b97ab768a8642d with SHA-1 3bb2a7f1 is in history

Change-Id: I7c22ece037cffbdd554bcb11eafa48278d63de7c