[automerger skipped] Merge "Merge "Update references incompatibilies files"...

[automerger skipped] Merge "Merge "Update references incompatibilies files" am: 1ea30578" into stage-aosp-master am: 23c55673 am: 51bbfddd -s ours

am skip reason: skip tag Change-Id I94e2ecd2075a577c5362293622ce5be5167cd91a with SHA-1 7f3393d8 is already in history

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

Change-Id: I36c218a5a6ad39ca07e261bf6beac78361e7b523