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

Change-Id: I0a6a7d18d92761281e32b291fddb31159912c556