[automerger skipped] Merge "Installd: Refactor binder tests" am: a60ff681ff am: 2ad480f43b
am: b3c07aaf83 -s ours
am skip reason: change_id I4ab448fabbab91cc608c318a07f9bf95547062fc with SHA1 8f7140dc28 is in history

Change-Id: I36d0c3b8081e6fd6a1612affaf7ea6757fbca940