Merge "Merge "Stop checking usage related contacts provider behavior" into marshmallow-cts-dev am: a46868fc" into nougat-cts-dev