Merge "Telephony: Fix CollectionIncompatibleType"
am: caa7326f33

Change-Id: Id0af4481932723bd4a28a26d1333b57d0d0a491e