[automerger skipped] Merge "SystemAPI for ACTION_SMS_EMERGENCY_CB_RECEIVED...
[automerger skipped] Merge "SystemAPI for ACTION_SMS_EMERGENCY_CB_RECEIVED intent" am: 6e6e56fc am: 0bbd08a4
am: c34655db -s ours
am skip reason: change_id I823bde70aba6940fd9ddd6193d80542c8f3e0e6d with SHA1 216373cd is in history
Change-Id: I367db5b4cad8c3f48160979d088dfab7def3fb7c