ApnPreference: Fix merge derp

Change-Id: I898620cbed8438fe4effaa463077bf5591f3cba1
Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>
Merge remote-tracking branch 'cm/jb-mr2' into jb-mr2