Merge "Fix system_notification_accent_color in Vpn.java as well." am: 15390dd13f

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

Change-Id: If7c98ffed0f1a8f549568b211582a4dcae0d566b