Merge "Fix ControlsProviderLifecycleManagerTest" into rvc-dev am: 20dd6a2631 am: f4cae7afa3 am: 640eacc2d6 am: 7403c41065 am: c4f745798d

Change-Id: I4f601bd871854b3a19dbcf31ff2ac40ada889345