Merge "Dynamically allocate objects in TelephonyRegistry upon ss <-> ds switch"
am: de5e074ee7

Change-Id: I235ada1332a154ca900ee778eed9562286cf7118