[automerger skipped] Merge "Do not use content light level if it's 0" into...
[automerger skipped] Merge "Do not use content light level if it's 0" into rvc-dev am: 1bb400d7 am: 55bee672 am: 1b8fe57c am: 5e3cb288 -s ours
am skip reason: Change-Id I6764623130f839df83fd6f5db1b97ab768a8642d with SHA-1 cbbbfab2 is in history
Change-Id: I84502d716eb8994515997c284124bb0761982804