Merge "installd: Add AdoptableHostTest to presubmit." am: c02c9230ea am: a76acb9558

Change-Id: I955356471919d501b326bd9bb813b9414fcc1729