[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 Change-Id: I718ad5c5ee11882447ca002f530f032fcbc1e1d0