Merge "Disable APN lockdown for apps targeting pre-R" into rvc-dev am: b8eacbec am: 436ead02 am: 6f7faeca Change-Id: Ia31d4ee446591be2a922dd81f3ef0ea45f83fb2c