Merge "Merge changes from topic "revert-1532910-connectivity_jar_in_apex-LKXFLQGLIU" am: 7de72f8875" into stage-aosp-master am: ba42f64156
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541542 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie22d1281939b2191304ecf3c9c8de54913f6aafe
This commit is contained in: