tree df91d54f52b46b5becae2f26199116c796581cf2
parent e898e26c02e5f40a06d4967256c77814522c6462
parent e0816871e42948ec4cddbbd7f79625ed2f1846a8
author Lorenzo Colitti <lorenzo@google.com> 1654873348 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1654873348 +0000

Merge "Don't attempt to override compat changes on user builds." into tm-dev am: cb2e7764e3 am: e0816871e4

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/18802575

Change-Id: I697837408e836010c40e814f330d5a8fdd6308ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>