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

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

Change-Id: Iaf22e8ada912d8ca485da29a8d91eeb3d1e2f7c4