[automerger skipped] Merge "DO NOT MERGE:CDD Annotations for Sensors" into oreo-mr1-cts-dev am: 18d18b7ac3  -s ours
am: c7c12d3fb7  -s ours

Change-Id: I723f73081bab2fea07e7f415b30a33c4b750d5c8