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

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

Change-Id: Ibe4f3826ceeb6fa390323a0828dc8b89a44d5dc2