Merge "Rename references to getLteOnCdmaMode" am: 7c849787ee am: 63da73532d

Change-Id: I7b32dea30b97fc1389054eb93b9dc160a1c88d3c