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

Change-Id: I8b6a9366df331202cd4748e26051d653cd8dc339