[automerger skipped] Merge changes from topic "mainline-telecom-constants" am:...

[automerger skipped] Merge changes from topic "mainline-telecom-constants" am: c155bb62 am: e5eef006 am: 0494ed6b am: f2addd13 -s ours

am skip reason: Change-Id Ic5269d577f007e01a0c9eaa95cd7e8814ab8f79a with SHA-1 4bb53ec7 is in history

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

Change-Id: Ida476dc4b52eb45a664bd7d1b4ddc3ff58d8fb22