Merge "Write a CTS test for the TelephonyProvider" into klp-dev