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

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



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