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

Change-Id: I73dba7869dc689e6221c58af5e7ebaccf909f577