[automerger skipped] Merge "Use framework-tethering-stub instead of framework-tethering" am: 7392615bbf am: e191e902b7 am: 0e6ddc8130 -s ours
am skip reason: Change-Id I97ef83f7f9b4c1376f373713036f5256318f1050 with SHA-1 9e04624f15 is in history

Change-Id: I1771917998eeda2d18abb1f576e5091828651ea0
tree: 6fbd76f74763ab3de587adc52c1e7225ff99292d
  1. core/
  2. services/
  3. tests/