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

Change-Id: I11a4b001ec4412fbc4ee187e1b2e99f52a9ac140