Merge "Resolver - Center text with no sublabel" into rvc-dev am: ae64ae50 am: a0b75026 am: b597b051

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

Change-Id: I0eb44d0d8e2534e25f9a5318135137ef0e12f7d7