[automerger skipped] Merge remote-tracking branch 'goog/sc-dev-plus-aosp' into merge-sc-dev-plus-aosp-then-rvc-qpr-dev-plus-aosp am: 1498ad9ac1 -s ours

am skip reason: Change-Id Ib0ac49609e444a53a6fee4575f5078e15f364eef with SHA-1 2812f607a0 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibe246bfddd5586d4dba3e798b099ebbd66e9f2a4
tree: 2ee7a0ac882d8b80134c733e2ba809af81eba74e
  1. tests/
  2. Tethering/
  3. .gitignore
  4. OWNERS
  5. PREUPLOAD.cfg
  6. TEST_MAPPING