Merge "Fix module-lib incompatibilities file is not referenced" am: 23ba02e90e am: 3743b8b6a5

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

Change-Id: I4d880da2d54605128cea5bae6a46bda8a4d5487e