Merge changes from topic "cbpf" am: 259ccb34a4

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

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