Merge "Change Bluetooth stack code not to use the hidden API for Mainline"