Merge "Fix ControlsProviderLifecycleManagerTest" into rvc-dev am: 20dd6a2631

Change-Id: I4a4a507e5578383006eed855c5d38feb9a0ef272