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