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

Change-Id: I66da4d1ff190243205f89c2d4e08b4506df4a40d