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

Change-Id: I121acbadeda772c546d211d6178828cd05c01826