Merge "Do not use content light level if it's 0" into rvc-dev am: 1bb400d7c6

Change-Id: I4f8601e3a3c9393e2ea0590e393d08b36ec4e8ef