Merge "Add telephony sources to hiddenapi-mappings"