Merge "Reverted to the old logic for APN selection" into qt-dev
am: 5d02fcb146

Change-Id: Iec56dfbbaeced79fb02973360ddf5df89b69609f