Merge "Remove @SecurityTest from cert generator" am: bf1d7e97ff am: 7f7578129e am: b36d4ad1ee

Original change: https://android-review.googlesource.com/c/platform/cts/+/1629740

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibd15148df76141a583a9e374a5f4a0433fb000ea