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

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

Change-Id: Ie54f14a45e1e5fae340990a8da8dfee8edf572c6