[automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section: 7.4.7" into oreo-mr1-cts-dev am: 6cc6a0c703  -s ours
am: bf6ddb73d4  -s ours

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