Merge "Add xml file for telephony component injection" am: 091db7ce48
am: ff77a47abd

Change-Id: I303e640f0d694bd5c225d6aaf3f56793cd4b1326