Merge changes from topics "kpFromCarrier", "noNetCapNoMigration" am: ce27c182f0

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

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