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

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

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