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

Change-Id: Iecf3c832b37c3a12e85f23ef2e6536f338c122ab