Merge "Unregister broadcast receiver when detached from window" into...

Merge "Unregister broadcast receiver when detached from window" into rvc-qpr-dev am: b86e5486 am: 26d711c5

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

Change-Id: I768a7947fa0e0decc41b3d72d0a6fabcef29e0a1