Merge "Allow carrier-privileged apps to register telephony listeners." am: fe78972bb2
am: 5d92d69be9  -s ours

Change-Id: Ib44b69e74974e3e68a5068bc5198bded7e0485be