[automerger skipped] Merge "Add test for TelephonyRegistry upon ss <-> ds...
[automerger skipped] Merge "Add test for TelephonyRegistry upon ss <-> ds switch" am: b9d188ed am: 13798058
am: 73f0b91c -s ours
am skip reason: change_id I3e56bbed0b299c195b30510b197333920c6716db with SHA1 44730a01 is in history
Change-Id: I4060c2e40e942e422ac73766d2d0bf67535c4c1d