Merge "Unbind service only if it was bound" into sc-v2-dev am: df7a526931 am: 04fcb16bb8

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15925082

Change-Id: I4f0daf6e747a9672c3946d85d2d2129315c33ac6