Merge "Whitelist telephony-common, ims-common." am: b8c3662e72 am: d7bf35a501 am: 9c88077444

Change-Id: Ieece8f11905ee658c0c2e28da7d556c5ad490781