Merge "Overload setTelephonyProperty without phone ID" am: f27242dbd6 am: 22189a729a
am: de387f3298

Change-Id: I479c3220cd9f9aef1bdf4184a6a268240218657e