Merge "Make android.hardware.bluetooth.finder apex_avilable for com.android.tethering" into main