[gpu tests] Update Android OS Version tags

The tags generated for the Android OS version name have changed
in telemetry. We also need to update the tags in gpu tests.

Bug: chromium:999335
Change-Id: I44f7af062a80c5cf5035d908893c712b07c4b837
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1790477
Commit-Queue: Rakib Hasan <rmhasan@google.com>
Reviewed-by: Kenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#694762}

content/test/gpu/gpu_tests/test_expectations_unittest.py

@@ -29,7 +29,9 @@ WIN_CONDITIONS = ['xp', 'vista', 'win7', 'win8', 'win10']
 MAC_CONDITIONS = ['leopard', 'snowleopard', 'lion', 'mountainlion',
                   'mavericks', 'yosemite', 'sierra', 'highsierra', 'mojave']
 # These aren't expanded out into "lollipop", "marshmallow", etc.
-ANDROID_CONDITIONS = ['l', 'm', 'n', 'o', 'p', 'q']
+ANDROID_CONDITIONS = ['android-lollipop', 'android-marshmallow',
+                      'anroid-nougat', 'android-oreo', 'android-pie',
+                      'android-10', 'android-kitkat']
 GENERIC_CONDITIONS = OS_CONDITIONS + GPU_CONDITIONS
 
 _map_specific_to_generic = {sos:'win' for sos in WIN_CONDITIONS}