Revert "DO NOT MERGE Check access to user and password fields in APN db" am: 5a848ed65a
am: b460b58464

Change-Id: Ie9f2a53666e0c463fdb6904e00806329a3a5a346