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

Change-Id: Ie299e00e7389f03ed455994f0492144ec8f7b27e