[automerger skipped] Merge "DO NOT MERGE: CDD(8.1) Annotations for section 7.4." into oreo-cts-dev
am: 257fc453c7  -s ours

Change-Id: I854c4be6839178cc58ac5e1f04d3821af268f634