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

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

Change-Id: I65f20287ff12090141bfe3ea6945e266d4f491da