Merge changes from topic "st02" am: 7119e9cf5e am: 6c7e24d4a3 am: 2f0bd122c2

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

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