[automerger skipped] Merge "Reland ag/31283254 Prepare for next year's...

[automerger skipped] Merge "Reland ag/31283254 Prepare for next year's development and bump FCM" into aosp-main-future am: bd841e91 -s ours

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

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



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