Merge "Add VPN app into power saver whitelist for a while to start its service" am: df656e61

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



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