Merge "Expose APIs required by CarrierDefaultApp as system APIs." am: 8c6e9e653d
am: d9cb5b9427

Change-Id: Iad08bbff172267a64d5d2b18050f2d23f4f1a60e