Merge "CTS test for the new TelephonyManager APIs" into klp-dev