[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: ee93fd71 -s ours

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11404719

Change-Id: Ic7cf6c5fe9020507a63049d4935f2c6dd4edefb0