IOS-647 Fix Custom Data targeting in criteria

We were not properly constructing custom data keys as `device/custom_data/custom_data_key`. They were instead added as a dictionary under a single key `device/custom_data`.

This did not allow the criteria predicate to properly match the keys to the criteria keys sent by the server.