Merge "Refactor enforceMeteredApnPolicy" into main am: 9f3b991a7a am: 0f930dc12c

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

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