[automerger skipped] Merge "[TNU05] Add no upstream notification" into rvc-dev am: b06fc85269 am: 42c7c94cd1 -s ours

am skip reason: Change-Id Ic6557f9f7703337596100cd6a477fd7239217166 with SHA-1 648fc2c8ea is in history

Change-Id: Icc444bba3028f56efa3833b505b3e241371ccd6c
tree: f255062e3b99073f41f5525db526f5980ba212a4
  1. Tethering/