Merge "Fixing tiles losing subtext in split shade" into sc-v2-dev am: b17f8f0e am: 865f3e85

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

Change-Id: I63fa0935e5b2eecaa960454c17f20f8fc8804733