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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I11a8539250d062b72f22e4c547fb80634c77f188