Merge "Add telephony sources to hiddenapi-mappings" am: 824c531396
am: f3cf84c690

Change-Id: I469462b12f0813e6ed7bd179ff58d4c09fbd50a5