[automerger skipped] Merge changes from topic "am-ce3313c2b8da49d9b34e7d44a98b2d63" into rvc-qpr-dev-plus-aosp am: a4c1adafe8 -s ours

am skip reason: Change-Id I0b07a0b520dedb479bf863fbfe898ae85b84b0f3 with SHA-1 e1a04c04d7 is in history

Change-Id: I682571a352b62ef242f4899586ba24ff1fc6f20a
tree: 8d469ca9daee0dec4a6a8ccee8f9d06a49eae17a
  1. Tethering/