Merge "Default to OTHER if label is unknown" into main am: 3377593ed6 am: 4fb523653e

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/vcard/+/2849741

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