Merge "Merge "Reduce padding below small, bold digital clock." into qt-dev am: 5894d5ce73" into qt-dev-plus-aosp