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

Change-Id: Idbbacbb96e6fe49225b004315e082c8b440b4b11