Merge "getTelephonyProperty returns defaultVal" am: bb9f855faa
am: ca854cc2b9

Change-Id: I6774ef18f185f35344bef3bf42ab5addf23ea03a