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: Ie2b5ac5fef0e3b4fe9b4db4fcddc3c04fff41618
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>