[automerger skipped] Merge changes from topic "ms52-movenetstats" am: cebdfba1bb am: 0c0ab875e9 -s ours

am skip reason: Merged-In I9e11eea30ea9c988498e005c33f173ba2d0a32ec with SHA-1 2d869d52a4 is already in history

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

Change-Id: I9c2afe8d685b1d9f226721ad8d907dde73b51997