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

Change-Id: Iac3c4a16ad7d40c90a4fa46a1cce3833bdb06fe2