Merge "Remove use of --check-compatibility:base" into main am: 88c837ff am: 780042cd

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3141278



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