[automerger skipped] Merge "Adjust Telecom code for newly exposed constants"...
[automerger skipped] Merge "Adjust Telecom code for newly exposed constants" am: 0f86cb9b am: 27b33f03 -s ours
am skip reason: Change-Id I1e3c0f9b0b4b0774bc0db8ba9240ffddbfda48c2 with SHA-1 d7536be2 is in history
Change-Id: I3fafe8f93d6647ea29eb15184928079982280327