Merge changes I69128db9,I13db22f8 am: aa15a8ea5d

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

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