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

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

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