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

Change-Id: Id2ef921b53d55037b2113dc2c2aad431fa9496fe