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

Change-Id: If5ebf9d38e419b225ebfdce50a1db89908a13f3a