[automerger skipped] Merge "Revert "DO NOT MERGE: CDD annotations for section 3.2.3.1 and 3.6"" into oreo-mr1-cts-dev
am: 9707dbe91c  -s ours

Change-Id: I88dc3139ec39d55dbed03bde36f46081c3a07e6e