Actually make CARRIER_PRESENCE accessible (for master)

Bug 20257870

Change-Id: If3996fe3ae1504897565111053848ceeb9a80c44
3 files changed