[automerger skipped] Merge "[Settings] Refactor TelephonyConstants" am: 93713113 am: d998b07a -s ours
am skip reason: Change-Id If0552d7ce20de5941667aa64e682202aaf32c597 with SHA-1 b1c7e210 is in history
Change-Id: I9b62bcb7acaa2987681aaa8f921877f24222d3c4