Merge "If the user add APN with empty APN type, map it for default type" into qt-qpr1-dev am: 201fc40816
am: f1a5d8a08a

Change-Id: I239d149303efd378a53ac34525c4a53f5eaed2bc