[automerger skipped] Merge "DO NOT MERGE: CDD Annotations for Section: 7.4.7" into oreo-mr1-cts-dev am: 6cc6a0c703 -s ours am: bf6ddb73d4 -s ours
am: 80abafd713
Change-Id: Iee75a8f09f3abb54aae66e160973562afb191dad
This commit is contained in: