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

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

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