[automerger skipped] Merge "Dynamically allocate objects in TelephonyRegistry upon ss <-> ds switch" am: de5e074ee7 am: 9e63a140d4
am: 3dd27a29a6 -s ours
am skip reason: change_id Iec56cc99f9e702ebdbbdd78ad5362de0ff4e3ff2 with SHA1 5d3546104e is in history

Change-Id: I9d99d5ec5cd2c70598168e41f2cb1da2c5f20500