Merge "Merge "Merge "DO NOT MERGE: Test for potential overflow in Visualizer effect" into marshmallow-cts-dev am: 8dd5b853c4  -s ours" into nougat-cts-dev am: ab385cc2ee  -s ours" into nougat-mr1-cts-dev
am: 4edb097813  -s ours

Change-Id: I3105842e948be681bff1a73755d96d98691e9aad