Merge "Refactor enforceMeteredApnPolicy" into main