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

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

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