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

Change-Id: I9d8182751f5303258083e0b0d0825902d06225d1