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

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