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

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

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