Merge changes from topic "bpf_tether4_rename" am: 3c35666892 am: 7d0693f6dc

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I056bdd8ef3117a89ff0f4f28a87978f703a325a2
tree: 11819eb01b9f97797638bf69f8379a4c455aac54
  1. framework/
  2. tests/
  3. Tethering/
  4. .gitignore
  5. OWNERS
  6. PREUPLOAD.cfg
  7. TEST_MAPPING