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