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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icdcb262662535c84edc5d7cc8c887842c85c534d