Merge changes from topic "trafficctrl_coverage" am: 08b8433a9a

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

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