[automerger skipped] Merge "DO NOT MERGE:CDD Annotation for 7.4.7/C-2-1" into oreo-mr1-cts-dev
am: 4173c4fce5  -s ours

Change-Id: If04529fed5b670277d0987cc9b9ff3cc83f275ac