[automerger skipped] Merge "DO NOT MERGE: CDD Annotation for Section 7.9" into oreo-mr1-cts-dev
am: 7049ee7b1d  -s ours

Change-Id: Ie134276d36c86c8c7584cc87ecf67798e32650ed