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

Change-Id: I086402e196613b5a5260f222b0949ad37e62994a