Merge "add missing spaces" am: 78e26beb02 am: 4829792ec2

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

Change-Id: I411a76aee8a4845960ba8c1235433621f2b7935a