Merge changes from topic "connectivity_jar_in_apex" am: e7ec916be5 am: cf0120bd86 am: 38ab8a08a5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I49964ba08c0983cd51fa06afe0be07a5c9bfaab1
tree: 5bbf9171eff16df6698df193bcb10243e60ac648
  1. core/
  2. service/
  3. services/
  4. tests/
  5. OWNERS