[automerger skipped] Merge "Use sysprop library for telephony props" am: afb16fa9d4 am: dc4de88fec am: 91bc7be712 -s ours
am skip reason: Change-Id Idefa10b5bdeaff69496bc66730a7398258f3a38e with SHA-1 1b5e241b92 is in history

Change-Id: I521192cb7014dc8f908c50c7ca8d67daf561c800