Merge "Add VPN app into power saver whitelist for a while to start its...

Merge "Add VPN app into power saver whitelist for a while to start its service" am: df656e61 am: 1457cc5d am: 24b65ea2 am: 61a07677 am: 5dd12480

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



Change-Id: I0578a934c9d19579039a5959b73d73b8d6aaece7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>