Merge "Switch to new incompatibilities targets" am: b5b629607b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0151a266ce3cafadb415eef476ef59d095d1b52b