Merge "[automerger skipped] Merge "Verify if the VPN app has been added into power save whilte list" into tm-dev am: 09130e00ae am: f3337a6bb8 -s ours" into tm-d1-dev-plus-aosp