tree a264a6548ae16760a74f111dca5c822fb3b956b2
parent 6a411d769c12fa71aa5de9b60eaab60ff20fea26
parent f4cae7afa3f1b5d018491fd137ee263426080c18
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583282375 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583282375 +0000

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

Change-Id: If2001093f6ef475601ede638117a14b87dfe1a52