Merge "Add public APIs for carrier apps" am: 89a1e85387
am: e11d665aae

Change-Id: I79ef6999d30a382d46e5c5b972f3ed7028891f5f