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

Change-Id: I53e5b94caa0c9e7388cb23f6b3f21c134d79d43c