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

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

Change-Id: I4470906f2cafbaa680baee8dff7fe9aacc9399e7