Merge "Fix some discrepancies in @Deprecated handling in Metalava" into main