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

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

Change-Id: If8854edc28c7aac04830feccc97b969d4ac2f2b7