Merge "Upgrade to metalava ab/8670428" into androidx-main