[automerger skipped] Merge "expose carrier id APIs and clean up" am: a118a4a772 am: f624391a28
am: 5e1e281c57  -s ours

Change-Id: I424f4c0335360fa95b82fae80653e625c8d8b32b