[automerger skipped] Merge "SystemAPI for ACTION_SMS_EMERGENCY_CB_RECEIVED intent" am: 60d9c9ce11 am: 598fce3136
am: e581f55051 -s ours
am skip reason: change_id I52677359261416e9ba46251bcd290d4e1540d7f2 with SHA1 4a79d9adac is in history

Change-Id: I13007ae60502a906a1fccc1dab884d8f1f57f019