Merge "Fixed incorrect retry timer value type" am: a3cc90b1c3 am: 0d3433a346

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1543612

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id441738af0fc76d08ccd428dc7cb6f9fd50d2f44