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

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

Change-Id: I19aaf17ec66ff33b2c3496e35281091708236f7c
tree: 44ebb4afe7b61a64f67e4fe0083c965be294a475
  1. Tethering/