Merge "Remove Kernel Command Line Support for CDMA Config" am: 65530b7549 am: c39e027103 am: 7d9429f990 am: 4465977195

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

Change-Id: I2ee3f27cd1515cacc6c0b9970f1ceec2e210d5f9