[automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section: 7.4.2" into oreo-mr1-cts-dev am: c91f21fb7e -s ours am: 78f6cc4bb8 -s ours
am: 312d1ebf3a
Change-Id: Ib79d26e5945dff717944f41a53fb69ae81eccb2a
This commit is contained in: