Merge "SystemAPI for ACTION_SMS_EMERGENCY_CB_RECEIVED intent" am: 60d9c9ce11
am: 598fce3136

Change-Id: If2c422038abc34b29d670c12b642c6dd0ce2b060