Merge "Add public APIs for carrier apps" am: 469266faf7
am: bd49957f81

Change-Id: Ic342d0e9855278ce65941d365c234ca5d8c1704e