Merge "Correct the year definition in Android.bp" into main am: dfc92a5414 am: 847e86641d am: a5ffb04e17

Original change: https://android-review.googlesource.com/c/platform/development/+/2896980

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