Merge "[DO NOT MERGE] Remove SecurityTest annotation" into marshmallow-cts-dev
am: 2de9aa7273  -s ours

Change-Id: Id70434619ea13ebd3785c69134142bfe0e405163