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

Change-Id: If5fe1d914e47ba45fa805e4c0654712e3857b236