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: If04a9159aa8ef65c7aef0d34505847812efe2f75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>