Merge changes from topic "revert-1532910-connectivity_jar_in_apex-LKXFLQGLIU" am: 7de72f8875 am: 56586b16dd am: 977ceb563f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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