[automerger skipped] Merge "Split incompatibilities into two files" am: 05c7f95c16 am: 50fdd46eb4 am: c34f639bdf -s ours am: f15ec5ebfc -s ours

am skip reason: skip tag Change-Id I8d72a399726a9414f9f44374c7c19ca6b1f3dc4f with SHA-1 1c0d4c1e1e is already in history

Original change: https://android-review.googlesource.com/c/platform/prebuilts/sdk/+/1671960

Change-Id: I8091c8961d0152d998b461cf2000b4a8d794df4f