Merge "Merge "Stop checking usage related contacts provider behavior" into oreo-cts-dev am: c364eb55" into oreo-mr1-cts-dev