[automerger skipped] Merge changes from topic "am-c2cb4c0f3ab84530991868dc5fd89fe9" into rvc-d1-dev-plus-aosp am: 6d18bd238b -s ours am: 48285e1e44 -s ours

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

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