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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d546cf99dd321ba68ef6c7d73d0675f43422de8