Merge "Disable APN lockdown for apps targeting pre-R" into rvc-dev am: b8eacbec89

Change-Id: If3965abae514a374da1d3fdb66dde345650652b0