[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: 0fa24dc8 -s ours
am skip reason: Change-Id I6764623130f839df83fd6f5db1b97ab768a8642d with SHA-1 3bb2a7f1 is in history
Change-Id: Ib52175d375be9c853049c8c13b428bce8bf99cb0