[automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section: 7.4.7" into oreo-mr1-cts-dev
am: 6cc6a0c703  -s ours

Change-Id: Ib668ac9a7891dac22b6372b12fee510bea94e121