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

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

Change-Id: If957c0783fd0e7f4a6340eed8cd6e19b466048a3