tree 482095e88e4af91f4f855b405b226d0fde7066af
parent 87463ab17e243bffd06a82c814dc5df896c058a6
parent f23da94516795bc04914a41aadde89b27efc39ca
author Maciej Żenczykowski <maze@google.com> 1649712370 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1649712370 +0000

Merge changes I2c3242f8,Iaa67d5ae am: b3bf5fedab am: f23da94516

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

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