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

Change-Id: I42a6e604ff65bbb77d0f23c584722c1ea44038e6