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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I396e8936cf8adc0c46555a3ef5d7771d3a268594