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