[automerger skipped] Merge "RESTRICT AUTOMERGE Add @SecurityTest annotation" into oc-mr1-dev am: 705bdcb00b -s ours am: 9e50f054dd -s ours
am: 30cd3efe5c

Change-Id: Ie5c0dafe0c9dd63da23250302e81e97fafdbab5e