Merge "[automerger skipped] Merge "DO NOT MERGE: Check for null sensor in SensorParameterRangeTest" into oreo-cts-dev am: 2ce89bf965 -s ours am skip reason: subject contains skip directive" into oreo-mr1-cts-dev