Merge "Update Split Shade's status bar font size" into tm-dev am: cd5a3820 am: 28592d09

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



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