Merge "Overload setTelephonyProperty without phone ID"
am: f27242dbd6

Change-Id: I75fdeb6067b2917899f8b54d3e2857beb5d13c52