[automerger skipped] Merge "Prepare for next year's development and bump FCM"...

[automerger skipped] Merge "Prepare for next year's development and bump FCM" into main am: 73293949 am: 3eefde7f -s ours

am skip reason: Merged-In I55d020804881862405a4b40a10e8b3718ec9294c with SHA-1 31d3f052 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3448643



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