Merge "Merge "DO NOT MERGE: Regenerate the golden images for N6 (560dpi) for nougat-cts" into nougat-cts-dev am: af0fb41585  -s ours" into nougat-mr1-cts-dev am: 9d89b4c74f  -s ours am: d313f3fb13 am: 005e83a209
am: 4033badd68

Change-Id: I4cb0bed15ae46334df853a3df99b3e0a28f494c7