[automerger skipped] Merge "Address aosp/1274403 leftover comment" into rvc-dev am: 305c46de82 am: ca9da38524 am: 251bbcbfc5 am: cc8ffc96c0 -s ours

am skip reason: Change-Id I81f2d268c9f26bc4488b06032477a73d071f73f8 with SHA-1 fab349c0a9 is in history

Change-Id: I368ab4a2d9887730660f27e9d95fe0f3afa43659
tree: 8133cdd5a77f55fc6f1252122546d7c872273baa
  1. Tethering/