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

Change-Id: I47c5af26e1652f89a3240665b5da34b163e21e60