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

Change-Id: I2dc15f126fb34767cadaa02000bbf83f374193a8