Merge "Add art incompatibilities for T" am: 1ba0b5e10a am: e5ee02e2f0 am: ce3615d364

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

Change-Id: Ice0ea279a2f6effb03995febd05882345da57caa