[automerger skipped] Merge "Expose various Telecom constants" am: 2c05571a...
[automerger skipped] Merge "Expose various Telecom constants" am: 2c05571a am: 09860f7a -s ours am: 51def5b2 -s ours
am skip reason: Change-Id Ib5cf76183edced3eeffbca87a7c980a85288f937 with SHA-1 ba820bda is in history
Change-Id: Iaf69a303bd39cb110123ca77f914ac61f40e2fd3