[automerger skipped] Merge "Address the comment of aosp/1288493" into rvc-dev am: 7c23183b5f -s ours am: e37bb0c05a -s ours am: 36dd27fedd -s ours am: c47e66c6dd -s ours

am skip reason: Change-Id I0cf337625cee31a47879c59e9b18657ea7624eb4 with SHA-1 147e5765ee is in history

Change-Id: Ic919016ebb18503c0ac167479550e8f3c52f3d04
tree: 8f4fad7117b7cd004e60535effd369f4dccdcd00
  1. Tethering/