Merge "add missing spaces" am: 78e26beb02 am: 4829792ec2 am: d20a4eb5c6 am: 737b791ad5

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

Change-Id: I1d91c8a4cb55ba15a25f9f00405d9b22cc6658d8