[automerger skipped] Merge "pppd: Move PLUGIN flag to defaults" into sc-dev am: 21f30887ef -s ours am: e337d74b46 -s ours am: 1f46de374f -s ours am skip reason: Merged-In Ic727eede2991bf1c8f798c74057be246551479db with SHA-1 87ee962d18 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ppp/+/14717476 Change-Id: I9d318dad710dcddd6ab0aab352f4777c7ded51f0