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

Change-Id: Id5c2cbc378db9857ae08166575dae11e37aaafd3