Merge "Merge changes from topic "revert-1532910-connectivity_jar_in_apex-LKXFLQGLIU" am: 1ef739b3" into stage-aosp-master am: 30a3473a am: ae6be438

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0448f25d58933d747e6c9c896dc3362e72752744