Merge "Fix some discrepancies in @Deprecated handling in Metalava" into main am: 0c73437caa am: b386957eaa

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

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