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

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



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