[automerger skipped] Merge "Schematize Telephony System Properties" am:...
[automerger skipped] Merge "Schematize Telephony System Properties" am: f3aab4b8 am: fc8dd06e am: 05d525ad -s ours
am skip reason: Change-Id I7e8e7dc77a98aeec2dbb73e00c5481ca0cb1a586 with SHA-1 7bcc995f is in history
Change-Id: Idf43c0c1edbc5ff8cec5c5ffe3c5ecac7f1a928a