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

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

Change-Id: I6a6de9549394b684e726419fe39ae1f2898a24d8