Merge changes from topic "metalava-compatibility-merged-codebase" am: 3854616b71

Original change: https://android-review.googlesource.com/c/platform/prebuilts/sdk/+/1662808

Change-Id: If8de7ad3e069e7e841cc24c8e25b295808937c93