Revert "without using aosp_base_telephony.mk in cm.mk"

This reverts commit 505036cb352221c346feb31d11273e77047402b2.
Revert "Revert "Revert "Switch to common_wifi_only"""

This reverts commit 336777e8d557ab335cf47d447c91909606894c43.
Revert "Revert "added TeamUB build tag""

This reverts commit 3bc1a1b6511a93d30e89799ab34284e66127ece7.
without using aosp_base_telephony.mk in cm.mk

(cherry picked from commit 505036cb352221c346feb31d11273e77047402b2)

Conflicts:
	cm.mk