Merge "Moves all compatibility flags to ConnectivityCompatChanges.java" am: 985534c95b am: efef03b0ad

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

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