Merge "expose carrier id APIs and clean up"
am: a118a4a772

Change-Id: I98e11289128a4057e800759ba6d5cb2664e2fb3c