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

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



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