Merge changes from topic "mainline-telecom-constants" am: c155bb62a1

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1471168

Change-Id: I5da60e9f18ee80293baf2b0a1a5734d72b20f907