Merge "Merge "[automerger skipped] Merge "Merge "Merge "Stop checking usage related contacts provider behavior" into marshmallow-cts-dev am: a46868fc" into nougat-cts-dev am: 038ab7d8" into nougat-mr1-cts-dev am: 91d54019 -s ours" into oreo-cts-dev am: cbe32eba -s ours" into oreo-mr1-cts-dev
