Merge "Fix for CtsNetTestCasesUpdateStatsPermission" into main am: 117edc6a77

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

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