Merge "Fix Bluetooth GATT API default handler assignment" into oc-dev am: 24f4743f92
am: 44e317e278

Change-Id: I2a66a50580a3e7c535c0eceec6f1d8fc1cf9b32e