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

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

Change-Id: I2cccd35fc31fac5e343c9a0e02f21f4c34e53310