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
am: a57b72b724

Change-Id: Ie723c4a91e4e3b9cdceff389dee606fed1b4e50b