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

Change-Id: I6bf169d83de6b9a300f9bb4717660183b1b9e24b