[automerger skipped] Merge "Disallow PAP authentication when MPPE is requested...

[automerger skipped] Merge "Disallow PAP authentication when MPPE is requested am: 4f319df8 am: 49f031ea am: 2f745097 am: c14e9954" into sc-v2-dev am: a18c3121 am: a5d599f7 -s ours am: f3bb0302 -s ours

am skip reason: Merged-In Ie318d45fe44294e97cf38da7f1834cf014cb4417 with SHA-1 4f319df8 is already in history

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



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