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

am skip reason: Change-Id Ife738339aeae00d2063fea6918b50204daef24fc with SHA-1 1317e27e91 is in history

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