Merge "Concatenate conditional" into main am: 55287774 am: d9c17e91 am:...

Merge "Concatenate conditional" into main am: 55287774 am: d9c17e91 am: 1c6a4aaa am: 9af240b4

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>