[automerger skipped] Merge "DO NOT MERGE: CDD Annotation for Section 7.9" into oreo-mr1-cts-dev am: 7049ee7b1d  -s ours
am: dc75db060b  -s ours

Change-Id: I874299467cdd0f8d3df882f0be13dbaf6902fcaa