[automerger skipped] Merge changes I40c22e2f,Id189676b,I9fb3be17,I63ca1668,I208bcd3f, ... into mainline-prod am: 38b7e2b257 -s ours

am skip reason: Change-Id I3f1d7019f1a12647b78630a412df3adf03e9e95a with SHA-1 8b3c07d951 is in history

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

Change-Id: Ic7f140ea7dd0d4bbbf245fe3514d31fc0e3a3ea8
tree: ab8bb020d430670cc431ac55053ee7e123549feb
  1. tests/
  2. Tethering/
  3. .gitignore
  4. OWNERS
  5. PREUPLOAD.cfg