Merge "Stop exposing generated AIDL from Tethering" am: ccf2c88a18 am: fdbd820293

Change-Id: Id2ae2730ea1a3177729def2b967c8868e330fca4