Merge "DO NOT MERGE: Mapping CTS tests with CDD Ids: section 5.11" into oreo-cts-dev