Merge "Merge "Update Split Shade's status bar font size" into tm-dev am: cd5a3820 am: c74c1dba" into tm-d1-dev-plus-aosp am: 4637721b am: 06618bea

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



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