Merge "Merge "Bump up contrast of NotificationInfo.Secondary" into qt-dev am: 19d096e7 am: 4156be70" into qt-r1-dev-plus-aosp