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

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

Change-Id: I445bfe6c46db1b0a8f741f790749ad3fa36847a1
tree: 1026a08bb4c4dddb4cc1d42f4832a60062b7042e
  1. Tethering/