Merge "Move SIP broadcast receiver to dynamic registration" into stage-aosp-master