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

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

Change-Id: Ieed5b31246e501d28553b6d581d3fcf4fd899ffb