Merge "Schematize Telephony System Properties"
am: 68ffb33f95

Change-Id: I9863eb0268dfccc1bef3d6706cb6f8e1eb1eeac4