Merge "Cleanup : don't mix seconds and milliseconds in retry delays" am:...

Merge "Cleanup : don't mix seconds and milliseconds in retry delays" am: f4abf286 am: 9aadd136 am: b3f238cd am: 0e179fb3

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



Change-Id: Id80a5bdbdf78d909f00a75d57531556a77c1dc57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>