Merge "Revert "Revert "Remove connectivity dependency on Preconditions""" am: aa1d743312 am: 5024171a1f

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

Change-Id: Id6fa989fa1d24261d29ab61d0a666cc6a33dc7b8