Merge "Prepare for next year's development and bump FCM" into main am: 73293949bb

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

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