Merge "Add CONNECTIVITY_INTERNAL to bt tethering related APIs temporarily" am: 60675ece9a
am: 1fe8de5336

Change-Id: I6d5928c623b72fc8415b499dc69f9775be21a58a