Merge "Remove calls to getLteOnCdmaModeStatic()" am: dc99dba89c

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1360804

Change-Id: Ib3c4df1565d6ea6eb29b7de2d8b1873bb2386847