Merge "Use sysprop library for telephony props"
am: afb16fa9d4

Change-Id: Ieeb580cd47e4210c9cb9edea4a0b561b73420040