Merge "DO NOT MERGE: Regenerate the golden images for N6 (560dpi) for nougat-cts" into nougat-cts-dev am: af0fb41585  -s ours am: 2c3d03cd25 am: cde256301e am: ebc12319c2
am: 92f36d1435

Change-Id: Id665a829447600793e10aa3b26c81a0107c07f1e