tree 95b4be5257be6978c68eeaad60d437f023e32c5c
parent 977ceb563f9e671f4434fafb36c5ec0df469f128
parent ba42f641562c5624d94426344e81bf513b4f8cd0
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1610045282 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1610045282 +0000

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