[automerger skipped] Merge "Fix ConnectivityManagerApi23Test failures and remove duplication." am: 5b2440cd35 am: b99373fca6 -s ours
am: b13869c598 -s ours
am skip reason: change_id I075b7408d2a1e1145c7a9031075e07fa1db37fed with SHA1 2d99b49651 is in history

Change-Id: I0264f0781595dfe939009dd9cc86a616a81d2b3b
tree: fa668ee545f32b6492fc49b821300865b899d494
  1. tests/