[automerger skipped] [SP21] Address comments for API council review about aosp/1172143 am: 4aa86b782b -s ours am: 2770b697e8 -s ours

am skip reason: Change-Id I141393f229e772d2eb9f7c156849e379bd71b845 with SHA-1 5752baa6b6 is in history

Change-Id: I47afb9f93dc191b4e04e4d5bd5ff4a1cfd566b02
tree: 9ad54d285b5bf913d7aa7ef284030d6c2c5ac686
  1. Tethering/