Merge "Ensure callbacks removed when view detached." into sc-qpr1-dev am:...

Merge "Ensure callbacks removed when view detached." into sc-qpr1-dev am: 209aec58 am: d8fc342d am: 8fc90a41

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

Change-Id: If7c11946ee90b006761d6ad150c048de5f3fe3f1