[automerger skipped] Merge "Add telephony sources to hiddenapi-mappings" am: 824c531396 am: f3cf84c690
am: f8a2dbface -s ours
am skip reason: change_id I1f7d2722bd7621c9f6d1195ea212a7a0454d560d with SHA1 6dd843a6b2 is in history

Change-Id: Ia9bbf24ebd22c4b2b8cae18d5723be98e6c7ceb9