Merge changes from topic "revert-1532910-connectivity_jar_in_apex-LKXFLQGLIU" am: 1ef739b3fa

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id71e4600041b523d941f6fe7f210c1bec7bb4c21