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

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

Change-Id: I017e1107ddec8b7700eb0bf64c21436bd7813fc1
tree: 15d4e4def154241cd0cb9189c2f46390521e3b54
  1. Tethering/