Merge "[automerger skipped] Add VPN app into power saver whitelist for a while...

Merge "[automerger skipped] Add VPN app into power saver whitelist for a while to start its service am: 4b776c64 am: 0554f4ec -s ours" into tm-d1-dev-plus-aosp am: e8b6bcbc -s ours am: e4af87b4 -s ours

am skip reason: Merged-In I9819a78ec0cbbd6879baae645ef42c22756b09d4 with SHA-1 4b776c64 is already in history

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



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