Merge "Move SIP broadcast receiver to dynamic registration" into stage-aosp-master am: 0e8b11a7f2
am: 79dd138644

Change-Id: Ic639191d353ae1e139f1ab5d8eb5c87c90384c3f