Merge "getTelephonyProperty returns defaultVal"
am: bb9f855faa

Change-Id: Icb376469926ed70658d8eceb54c9da4ab57a2d55