Merge "Merge "Fix the implementation of BluetoothCodecStatus.equals()" am: 3a1ca762c9 am: 493dbf789f" into pi-dev-plus-aosp