Merge "Concatenate conditional" into main am: 5528777496 am: d9c17e91bb

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

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