[automerger skipped] Merge "DO NOT MERGE: CDD annotation for section 3.12" into oreo-cts-dev
am: 7cf58683cf  -s ours

Change-Id: I75b61c2de9124a8ff4bf36771a3771860d3ac5ea