Merge "Add guards around unbind" into sc-dev am: e2b3bf94c5 am: bc117eebdc am: 2d72cd5dd3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301093 Change-Id: I706e76d1ef47df5c38a546009f8553a3765d5b4e
This commit is contained in: