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

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

Change-Id: If53683eb2f993b61854e69496f9569fa90fe93eb