Merge "Extend apn retry configurability to more apn types" into nyc-mr1-dev