Merge changes I70384830,Ie97c2611,I7064edda,I290136b4,Ide697f65, ... am: bbae90476d

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

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