Merge "Add BOARD_GENFS_LABELS_VERSION" into main am: 7adba5989c

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

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