Merge "Disable APN lockdown for apps targeting pre-R" into rvc-dev am: b8eacbec am: 436ead02 am: 19727ed4 Change-Id: Iec63c3a3681f39cdffce94dd302be257fb689d02