[automerger skipped] Merge changes from topic "am-99b870448c8c43b2815c42861ac6235c-rvc-dev" into rvc-dev am: df554bb5f8 am: 47285473fe -s ours

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

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