Merge "Fix system_notification_accent_color in Vpn.java as well."