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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie83aa9bcb14313bb721908c79a4d53d05e86eb99