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

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

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