Merge changes from topics "2374762-android-bp", "2374763-android-bp" am: d42df9593e

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

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