Merge "Merge "Fix BLE CoC Client test" into android13-tests-dev am: 1a78d95e40 am: fb9a856164 am: b20b922b2b" into udc-dev