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

Change-Id: Ic3a664bc883efe77e30926ae86b56c49f63ee586