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

Change-Id: Idb0f74382c1e63ec68d35d15f32f76d9fc768eff