[automerger skipped] Merge "DO NOT MERGE:CDD annotations for Section 7.4.1" into oreo-mr1-cts-dev am: 7ddffb0ba0  -s ours
am: 8ef7c11cc6  -s ours

Change-Id: I225d157a64138d9bf868c426a8e2d06492432c57