Merge changes from topic "ipv6_prov_mode_metrics" into main am: 3a18c0e7b4 am: 33115d345d

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

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