Merge "Attaching broadcast receiver on attach/detach instead of everytime visibility changes" into sc-dev am: 27500d78 am: 0ad60ed4

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

Change-Id: I20ce0c79fe18f9b1e53a5bf2968c5630a60647e1