Merge "Ensure callbacks removed when view detached." into sc-qpr1-dev am: 209aec58 am: 278989e6 am: b1e3da65

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

Change-Id: I1dc66c715864f7e5c856c346719ceb9a6d53ded8