Merge "Update the method based on API feedback" am: 0a5d964242 am: 80a70a3679

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

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