Merge changes from topic "connectivity_jar_in_apex" am: 60dfb880de am: 6feb97a95b am: 7a26ec1976

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I49964ba08c0983cd51fa06afe0be07a5c9bfaab1