Merge "[Bluetooth apex] Use new apex name" into tm-mainline-prod