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

Change-Id: Ibe1fb87f3a6f76cd7276fc9ed4e92e9684ac0cf7