Merge "Update golden images (auto-generated from Scuba): invocation I42400010428214473" into androidx-main