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

Change-Id: I4c67f7f730517ab9cee1c7497c64481be75e999d