Merge "Run code_generation.py after an upstream merge of 'aosp/upstream-main'"