[automerger skipped] Merge "DO NOT MERGE: CDD annotations for Section 3.9" into oreo-mr1-cts-dev
am: da965cea82  -s ours

Change-Id: I4fbe22083f9679a0f9a2c2971c20a6cc9bdb483c