Merge "Notify content capture on detach before setting attachInfo to null." into sc-qpr1-dev am: 84a7a431cc

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

Change-Id: I73de6397331655133f2e00ee1580ae09182afd76