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

Change-Id: Ie3796316ee33c83c6a798c90ceb97c62307d62b5