Merge "Merge "Add a dumpsys to LightsService for manual testing" into rvc-dev...
Merge "Merge "Add a dumpsys to LightsService for manual testing" into rvc-dev am: b20eb1ca am: 19d0fe43" into rvc-d1-dev-plus-aosp am: 428cfac5 am: 54e4c9e4
Change-Id: I3372c7350434caba9bf35616efedb3f4c5ae04ce