Merge "Fix potential NPE in telephony registry dumpsys." am: 06bdf061f0
am: 0e1e725bb5

Change-Id: I1c5e56f0e18ce49addfaab5a3ffa146fad8b08b9