Merge "Avoid onServiceDisconnected() for unbind Service"
am: a37c252248

Change-Id: I825afa6ce1a341f37687fb453a1eeda1ad19ae86