[automerger skipped] Merge "DO NOT MERGE :CDD Annotation for section 3.8.6" into oreo-mr1-cts-dev
am: d3a0c015fb -s ours
am skip reason: subject contains skip directive

Change-Id: Ib35979386d49fb6bdc7940feb2f00b02fa337f36