Merge "Add guards around unbind" into sc-dev am: e2b3bf94c5

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

Change-Id: I4686e2e69499bd354fd452762ae3d2be33e15008