tree 716418b61322c175d5b1bce32eeb000ffc24fd23
parent f911a0098c98ec66613ea7314730d487db3371bc
parent 984c39992c4391c86cfd5a67461dc277a23af3be
author Maciej Żenczykowski <maze@google.com> 1646701900 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646701900 +0000

Merge changes Id5f5bdfc,I67b9f30b am: 984c39992c

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

Change-Id: I6f5177c8a60b06cf52a8a1fa0b6d17769e3b3710