Merge "Made same APN retry maximum counter configurable" into sc-dev am: 69bd0612 am: fa5e300b am: 08601c0b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14938453

Change-Id: I7ca4fb867c857cb7061fe5aa13892bb49412803e