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