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

Change-Id: I733fa445486b401647e94be4c59ccba412fa7a97