[automerger skipped] Merge "Fix the incorrect behaviour when receiving a...

[automerger skipped] Merge "Fix the incorrect behaviour when receiving a mismatched renew lease." into rvc-dev am: bb771b1f am: 17bed15f am: 5f01cb77 -s ours

am skip reason: Change-Id I6fd37e6af1f6bf3a8ce8de7b9a1ef4731de5db27 with SHA-1 2f80c66c is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11066322

Change-Id: I6f5a5c29a7e8a7869d195fe1905296be9bf0b97e