Merge "Move SIP broadcast receiver to dynamic registration" am: fbdb5f2b63  -s ours
am: 40c722c9af  -s ours

Change-Id: Ia74f09ffb63addeb6c7b3ed1091b8842ee3b37c3