Merge "Switch to new incompatibilities targets" am: b5b629607b am: d258bf95fe

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If764610f4ac9f30a30e6968b7cd9b5e4936a68bd