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

Change-Id: Iff7b36a5b35766788c1f8cf7e015646804c19fc3