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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id85d632781cd8eb0850e919cd6bf990fca17f414