Merge "Fix Bluetooth GATT API default handler assignment"
am: 612b8bef0c

Change-Id: Ia71233576b7f8a712abf495164923a092cdc5677