Merge "Add carrier config for EAP-AKA fast reauth feature" am: 55d337b11b am: 476359da49

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

Change-Id: I783e63a66de5e4e5f08aa8bd693ac654e73c5054