Merge "WRITE_APN_SETTINGS is also required to read" am: 0beefc0af5 am: e5c77fc978
am: 4af8f3c3bf

Change-Id: I032f399674847edf7698ad13d5914e33a0df70d1