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

Merge "Run code_generation.py after an upstream merge of 'aosp/upstream-main'" am: 968ebb2e am: 6d797e27 am: 96d6d117

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2321917



Change-Id: Icf330a71e16e31eb5e898a52738a28727551cca6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>