[automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section 3.8.3" into oreo-mr1-cts-dev
am: 09ce4c948b  -s ours

Change-Id: I9a94b3c79ed709ba5afb7636ed6d9553ce411e5a