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

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

Change-Id: I8a04038ea01385cc7a4aaa832fc58870f16987a0