Merge "telephony: Add support for choosing a default APN" into o8.0