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

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

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