Merge "Fixed that telephony registry service reference incorrectly assigned"
am: b0510407da

Change-Id: I0d65bc2cc843ce49a10cf6fdebfc4e1f602edaea