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

Change-Id: If2001093f6ef475601ede638117a14b87dfe1a52