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

am skip reason: Change-Id I0cf337625cee31a47879c59e9b18657ea7624eb4 with SHA-1 0dafa92b93 is in history

Change-Id: Ib057eca68ca840f78f2c817ebb31df3cc377caa6
tree: 375b7a805e75226301a720007d14fa412a2e5d42
  1. Tethering/