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

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

Change-Id: I83f6d5d9cae1230ed0d99e0dbd2b7ab41cf8f7c2