Merge changes from topic "trafficctrl_coverage" am: 08b8433a9a am: f572e7ffb9

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

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