Merge "Merge "Update references incompatibilies files" am: 1ea3057847" into stage-aosp-master am: 23c55673c6

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

Change-Id: I33e4430689838b4ecd3aea4e2fa031727151e7d2