Merge changes I91e987d6,I03e7cda7 into tm-dev am: 0657071494

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

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