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

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

Change-Id: I359712580db9387032db37029ccfc8461d64fe5e