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

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

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