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

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

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