Merge "Overload setTelephonyProperty without phone ID"