Merge "Merge "Remove the *byteShort string resources from the frameworks" am: 73caeda3 am: 8e6a5fa4" into tm-dev-plus-aosp