Merge "Installd: Refactor binder tests" am: a60ff681ff
am: 2ad480f43b

Change-Id: Id8fbadc450391d5d24c88ac7582d06ac23418f6d