Merge "Use framework-tethering-stub instead of framework-tethering" am: 3e4ab5c2b5 am: 101b4e2bb5

Change-Id: I42e51c703c47bdb5e589747047b5a4ef77a9ed82