Merge "Rename get/setRetryInterval to get/setRetryIntervalsMs" am: 9ef01fca2a am: a746f701e2

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

Change-Id: I835f581ccbdd46d4cfa0c89209dab5382008be77