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

Change-Id: I23f5fdf5b3584861818bc378b85f98fc2e33ebb8