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

Merge "Disallow PAP authentication when MPPE is requested am: 4f319df8 am: 49f031ea am: 2f745097 am: c14e9954" into sc-v2-dev am: a18c3121

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



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