[automerger skipped] Merge "Revert "Revert "Remove connectivity dependency on...

[automerger skipped] Merge "Revert "Revert "Remove connectivity dependency on Preconditions""" am: 9cb39acf am: e3a7e8d8 am: 018b3a1b -s ours am: 0cbd0b8a -s ours

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

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

Change-Id: I4d123b99aa607e4470e4730b1a28432eb1e380c1