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: I70cdc5ba92d03d76620db5fb2e78a65c9976539c