[automerger skipped] Merge "SystemAPI for ACTION_SMS_EMERGENCY_CB_RECEIVED intent" am: 3c397a6217 am: 42d7faea52
am: f08074d6ec -s ours
am skip reason: change_id Ic7124f30fae6faa482467fd9235ef6155854f589 with SHA1 9c1260c818 is in history

Change-Id: I3668eadec96096f94384253783c7805e38406004