Merge "Ensure content shows before/after name" into sc-dev am: 886ccd1c am: ad04ba9a am: f920ae55

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

Change-Id: I34d99f6332102277ccf63bf251524601438eacfa