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

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

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