[automerger skipped] Renamed retry interval to retry duration am: 133b7dc7...

[automerger skipped] Renamed retry interval to retry duration am: 133b7dc7 am: 55fdeddb am: 3eb95a64 -s ours

am skip reason: Change-Id I7c4bbe0a77301761525ae793892bb811637027b5 with SHA-1 32ea9e35 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I60b41732784c844a8b79d42b2061bebc3277d923