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