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

Change-Id: I63a78822f4a4c3c4d6e71af721c7a31a5bdba03a