Merge "Concatenate conditional" into main am: 5528777496 am: d9c17e91bb am: 1c6a4aaa1e am: 9af240b424 am: 4b8413e03b

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

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