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

Change-Id: I0e637eeb50693c5d373ffdc0b81e2da313e52beb