[automerger skipped] Merge "DO NOT MERGE: CDD Annotation For Section 7.5" into oreo-cts-dev
am: 5044539938  -s ours

Change-Id: I4e050ea88a7e9e54d395f611eb69691e88174425