[automerger skipped] Merge "[TNU05.1] Address aosp/1237036 leftover comments" into rvc-dev am: 5da521b457 -s ours am: fa5d45614b -s ours am: 0172dec0ca -s ours am: 06d6182c15 -s ours

am skip reason: Change-Id Ife738339aeae00d2063fea6918b50204daef24fc with SHA-1 5e9c40c012 is in history

Change-Id: I25fde201e2a510553c3988885589142d66eff14f
tree: aa307cabee8f5f6b5c74c1aa0d7e0ec1b4ecd3cc
  1. Tethering/