Merge "fix(statusbar): notification icons become too small when smaller font size" into udc-qpr-dev am: 0161f47861

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

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