[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypick-whitepoint_means_dimming_client_target-yylxhyxnjw" into tm-mainline-prod am: efd9f3d9 -s ours

am skip reason: Merged-In I1be65f7c511fefa239305e0735637126a1cd6622 with SHA-1 bf0bbc2d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/16980752

Change-Id: Ieead0655e95bfb9e507755eca5b6a963587acf22