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

Change-Id: Ibbe90fef046ed10899e55811a575dcff5ea8c863