Merge "Remove target SDK version from Telephony manifest." am: 1f03bfd432 am: 8b08064ac1
am: cffaeb64d0

Change-Id: Ie62a793f6af50e6476bb16599500047f835148c2