Merge "Fix missing space between umo and shelf" into tm-dev am: b7f076b2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587106



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