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

Change-Id: Ie713b53f66141fd17cea8657dfe16b0003e32f1d