Merge "Reconnect to installd when it restarts." am: 48d5d6cda8 am: fe35f0f4f6
am: e286d1b2f8

Change-Id: Ib7ff45fee2865a28e7cb138d9fd418d7a3e50c94