[automerger skipped] Merge "RESTRICT AUTOMERGE Add @SecurityTest annotation" into pi-dev
am: 4bb0a0bb70 -s ours
am skip reason: subject contains skip directive

Change-Id: I4cd5ca47426c5cd5d8151101343c8b4e2dd45c9c