Merge "DO NOT MERGE: Regenerate the golden images for N6 (560dpi) for nougat-cts" into nougat-cts-dev