Merge "Clean up flag network_metric_monitor" into main am: 7ae378b0b9 am: e055abbbbb

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3311756

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