Extend apn retry configurability to more apn types
am: c1f0e87051

Change-Id: Id44b57c992efb8d649a2fa409b798714364c5dcc