Merge "Default CDMA subscription source to RUIM/SIM" into oc-dr1-dev am: 356d1ac545
am: d09386a664

Change-Id: I9ae15ef2270314c9fbfcac110c97857b229e4804