Merge "Merge changes from topic "revert-1532910-connectivity_jar_in_apex-LKXFLQGLIU" am: 7de72f8875" into stage-aosp-master am: ba42f64156 am: ec5f9aed57

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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