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

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

Change-Id: I9999c09894e1322150a9bcb4989af3c33c7f0ec0
tree: 4bbdddde89de91a2f3aaa854f8e4d1a4a557aab4
  1. Tethering/