[automerger skipped] Merge "Use framework-tethering-stub instead of framework-tethering" am: b8a6208240 am: 101b4e2bb5 am: 42dbff65d6 -s ours
am skip reason: Change-Id I97ef83f7f9b4c1376f373713036f5256318f1050 with SHA-1 44fc26d19e is in history

Change-Id: I1771917998eeda2d18abb1f576e5091828651ea0
tree: e9a016091cd4f28c8689804f0a6fb0ce84d4059c
  1. Tethering/