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

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



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