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

[automerger skipped] Reland ag/31283254 Prepare for next year's development and bump FCM am: 9cd33ffa -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: I3d61548bc17e90ea45da6fb7d8bd7309eab79919
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>