[automerger skipped] Merge "Revert "Revert "Remove connectivity dependency on Preconditions""" am: ed231fdfeb am: f689c29d0f am: 018b3a1b3b -s ours

am skip reason: skip tag Change-Id I3a67d266b32142c034520acbcdc30f7213db5e13 with SHA-1 1818dbb99a is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635319

Change-Id: I2d568af3f71ae143c535090487b0b85754421fa6
tree: fb68256e21716e2198456f6be8e80cb29d0974f9
  1. framework/
  2. service/
  3. OWNERS
  4. TEST_MAPPING