Merge "Revert "Update baseline files due to bug fix in Metalava"" into main