Merge "Add BOARD_GENFS_LABELS_VERSION" into main am: 7adba5989c am: c2ade867be

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3337494

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