Merge "Fix ControlsProviderLifecycleManagerTest" into rvc-dev am: 20dd6a2631 am: f4cae7afa3 am: 640eacc2d6 am: 7403c41065

Change-Id: I4aab2e523f0d54c95f0fa0d690ab6350d82673ec