Merge tag 'android-7.1.1_r4' of https://android.googlesource.com/platform/packages/apps/CarrierConfig into n7.1

Android 7.1.1 release 4
tree: 593b9ba3615e758f5883a29a0788ac03aeae46fb
  1. assets/
  2. res/
  3. src/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml
  7. proguard.flags