Merge "Update set|getRetryIntervalsMs to Millis" am: c6fe30068d am: 058149884f

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

Change-Id: Ie3a9bf8043ce00fe838720c094b5b180af829910