Merge "Merge "Fix ControlsProviderLifecycleManagerTest" into rvc-dev am: 20dd6a2631 am: f4cae7afa3" into rvc-d1-dev-plus-aosp