[automerger skipped] Merge "[Settings] Refactor TelephonyConstants" am: 9371311309 am: d998b07a01 -s ours am: 54209e0477 -s ours am: de17f8a7f1 -s ours
am skip reason: Change-Id If0552d7ce20de5941667aa64e682202aaf32c597 with SHA-1 b1c7e21066 is in history
Change-Id: Id3f57a4b4d8d2106c754ca23aa163425476a43c9
This commit is contained in: