tree 13283d02dcffd8774f0574c1bd25817f7000863c
parent 8564a5ca066d4939f630437f06ae5a60159cb0a3
parent 177975f25bee61d77431ddd7f61ab629f99ade2d
author Lorenzo Colitti <lorenzo@google.com> 1611673277 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1611673277 +0000

Merge changes from topic "bpf_tether4_rename" am: 3c35666892 am: 7d0693f6dc am: 177975f25b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I383d31ffb54f0e3f23d1df8b794b544a38a29cac