bug 894906  caused test disables targeted at Nexus 5 devices to also prevent tests from running on Nexus 5X devices. We were targeting disables based on whether the device type contained the string of the platform the disable targeted. The bug was caused by the fact that "Nexus 5X" contains the string "Nexus 5".

I'm fixing this in a two step process: 

1) Explicitly add Nexus 5X entries for all tests that are disabled on Nexus 5. This should be a no-op because these tests are already disabled through the buggy logic. This is happening in https://chromium-review.googlesource.com/c/chromium/src/+/1355482.

2) Fix the buggy logic so that disabling a test on Nexus 5 no longer disables it on Nexus 5X. This should also be a no-op after step 1 because all of these tests are now explicitly disabled. This is happening in https://chromium-review.googlesource.com/c/catapult/+/1355419.

At some later point, someone needs to go back and check with Nexus 5X stories actually need to be disabled and which can be safely reenabled. This bug tracks that effort.