[automerger skipped] Merge "Expose APIs required by CarrierDefaultApp as system APIs." am: 8c6e9e653d am: d9cb5b9427 am: 03b6954f5b
am: 01f3aa4fff -s ours
am skip reason: change_id I3c678522e70b5d89a6a5a8f6bdb1e3fd91ca8aee with SHA1 61f098ecaf is in history

Change-Id: Ia293151feff2d0fa112867d30a818bf475a991e7