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 am: 33ea8dbda8 -s ours

am skip reason: Merged-In I2aa99b8ea8dbe668a45782f50a4a0ac82e72b7a2 with SHA-1 dd9b794e5c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/18723325

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