Merge "Merge "DO NOT MERGE CTS Test for security vulnerability fix: Equalizer command might allow negative indexes am: fb2c7c342c  -s ours" into marshmallow-cts-dev am: c310aa9633  -s ours" into nougat-cts-dev