Merge "Add TelephonyManager test hidden API for testing"