Merge changes Id87b88f6,I67dfba75 am: fab97c22b2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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