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

Change-Id: Idb2328b3e611dc2c3902de5dc9f9736699eab0f0