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

Change-Id: Ie18a2a483bb08d924a93db4f7dd95c948a6fb323