[automerger skipped] Merge "DO NOT MERGE: CDD Annotation for section 3.10" into oreo-cts-dev
am: a47e69baa9  -s ours

Change-Id: Id701c4849bdbd54bf3d2f7f69109aeac6ff63cc8