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