Merge "Merge "Removed telephony apex" into tm-dev am: 9bcd7d5f7a am: c07681e7ad" into tm-d1-dev-plus-aosp