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

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

Change-Id: If63a4f2b1afbbce260c51c427a8867e6a93a91af