Merge "Remove use of --check-compatibility:base" into main am: 88c837ff00

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

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