Merge "Ensure content shows before/after name" into sc-dev am: 886ccd1c1d am: 1ba8b047f4 am: 550cbb0fb6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15273595 Change-Id: I2446b5b8ddbef80220b8fb4447f9ece5e84de8ac
This commit is contained in: