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