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

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

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