[automerger skipped] Merge "Use framework-tethering-stub instead of framework-tethering" am: 7fa9971ec6 am: e67473517a am: e457375dba -s ours
am skip reason: Change-Id I97ef83f7f9b4c1376f373713036f5256318f1050 with SHA-1 273a3e1c54 is in history

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