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

Change-Id: Ieacf8495a0b7af6af5fb051e72a92b727b1b230f