tree 20c20efed4243c561c2877a344ecefedf4cc283a
parent 7fb53929453649cea8e8fbebbb4bc659877708cd
parent 7acd20616002756106a79809dc61fd20197ab37f
author Treehugger Robot <treehugger-gerrit@google.com> 1675236374 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1675236374 +0000

Merge changes Ie2ba9805,I8f5b23f9 am: 7acd206160

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

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