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

Change-Id: I7d4f4929057490948ebbcb956eb3e2ba4aca6e3a