am 712d5b3d: am 147b6a35: Merge "[DS] Correct the access method for telephony...
am 712d5b3d: am 147b6a35: Merge "[DS] Correct the access method for telephony system property" into lmp-mr1-dev
automerge: 2e233d30
* commit '2e233d30':
[DS] Correct the access method for telephony system property