Merge "Revert "Use 600dpi goldens from OnePlus"" am: 2c11ce8de3 am: bff9403ca9 am: 52fbb81414

Original change: https://android-review.googlesource.com/c/platform/cts/+/1667411

Change-Id: I530664903f1872d641f44b6f75ed24ccb3570c56