Merge "Simplify the burst time logic" into main am: a906743bc7

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2938999

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