[automerger skipped] Merge "DO NOT MERGE:CDD Annotation for 7.4.7/C-2-1" into oreo-mr1-cts-dev
am: 4173c4fce5  -s ours

Change-Id: Ib7552f15d5179e93b2a274f5884f4b5ac10e7fe5
tree: 032cbcdf0dd85b1018333669ef4029ed32955c5c
  1. tests/