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

Change-Id: I8827be128443902d7f614fdd275519723bd76dc0