Merge "Fixes how unbindService works" am: b7682d401f am: 3339f21560 am: e3100d7111

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564532

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib3d3939345cf4aefd63172eb56c1a8b99acd3df0