[automerger skipped] Disallow PAP authentication when MPPE is requested am:...

[automerger skipped] Disallow PAP authentication when MPPE is requested am: 4f319df8 am: 49f031ea am: 2f745097 am: 1ee4525e am: b5972826 am: e343f61f -s ours

am skip reason: Merged-In Ie318d45fe44294e97cf38da7f1834cf014cb4417 with SHA-1 997a4a39 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17614780



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