[automerger skipped] Merge "Add test for startPptp" into tm-qpr-dev am: 3af54dd20f -s ours am: 9eb6942e58 -s ours

am skip reason: Merged-In I0854fbeaf1a3e3554c157fde227a7bfa187b1013 with SHA-1 522cea7d4e is already in history

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

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