[automerger skipped] Merge "Schematize Telephony System Properties" am: 68ffb33f95 am: 6da5e2d4ba am: 5b97624279 -s ours
am skip reason: Change-Id I61f07d29ae871b856ebbcf690238e35f265b56c2 with SHA-1 14bb3d04cb is in history

Change-Id: I9b3cd4ed30ddd3ec977864bc9ca6a56c93651256