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

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

Change-Id: Ie50a992e875cb453b16937dc8861a142c657e0cb