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

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

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