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>