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

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

Change-Id: Iec2c68cb13923d126d375030f2867ef384c662f1