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

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

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