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

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

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



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