Merge "Concatenate conditional" into main am: 5528777496

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

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