[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 am: 80abafd713
am: 518da1c897  -s ours

Change-Id: I737ff1f97cb5c2db810b29c988000eb61af89fbd
tree: de847d042b4786575ea225c15c65fccd26d4f529
  1. tests/