[automerger skipped] Merge "DO NOT MERGE: CDD Annotations for section 8.2" into oreo-mr1-cts-dev
am: 63fe467f4b  -s ours

Change-Id: I95380628189bcad27f84a23e658d9d0781914740