Merge "Add TEST_MAPPING for LightsService" into rvc-dev am: e8c53fee am: b64f3a3f am: 3943ae34 Change-Id: I66f5cd24c8e3b341f751abcad34566bbd1f8b6fe