[automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section: 7.4.2" into oreo-mr1-cts-dev
am: c91f21fb7e  -s ours

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