Merge "Adding missed incompatibilities due to metalava bug" am: 0db080fbf1

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

Change-Id: I687683a81db894ac5e7ea907ee033ee998f8b1e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>