Merge "Revert "Remove connectivity dependency on Preconditions"" am: 84319f2fe0 am: 4ac52e881c am: b5437344c6

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I04b48a4afef8d62d1368f5c7f7d907cb5e12c82e