Disallow PAP authentication when MPPE is requested am: 4f319df8 am:...

Disallow PAP authentication when MPPE is requested am: 4f319df8 am: 49f031ea am: 2f745097 am: 1ee4525e am: b5972826

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



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