Merge "Remove calls to getLteOnCdmaModeStatic()" am: dc99dba89c am: 9b8ead4cc0 am: 072917f665 am: d042c19fd4

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

Change-Id: I59af3024a89d40f95590f8feb4ccb27086870e9d