Merge "Refactor enforceMeteredApnPolicy" into main am: 9f3b991a7a

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

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