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

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

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