[automerger skipped] SettingsProvider: use sysprop as API for telephony am:...
[automerger skipped] SettingsProvider: use sysprop as API for telephony am: 6eac9290 am: 107e3e12 -s ours am: 7fcaae70 -s ours
am skip reason: Change-Id Ib28d5804dcb8480f5a00a869c16a1112fb2c075d with SHA-1 b45b890a is in history
Change-Id: I6cc0af8e97b07f09f4abf01424cc77e77aa9f8ab