tree 6898060a7a62413e7ca26051ed6b525242dace7c
parent 3c3b1794c0fdc7cce3e1b139c4d13e7e97e01486
parent fc8d527a29e12398ec41dbcac234c29b2b1d61a1
author Patrick Rohr <prohr@google.com> 1643919284 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1643919284 +0000

Merge changes I50417e69,I6892d81c,Id8846844,Ib22da8d4,Iad66f0d4 am: 445dede4eb am: 1c019c1748 am: fc8d527a29

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

Change-Id: I6c63ce949a395ac1903a80cbb1d4b1217facd4ac