Merge "Remove connectivity dependency on Preconditions" am: 83c34e272a am: b8c6c46986

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I462f0d97bf150af7f32238e15e88d34e4c17eed7