[automerger skipped] Merge "Populate 'hasKnownUserIntentEmergency'" am: 59d8275546 am: b75330904e
am: a3360f911a -s ours
am skip reason: change_id I7b1a8832ab86b3e7d8f9af24eb4f7bde7d566612 with SHA1 6d9e7457da is in history

Change-Id: I06368567edd8ccc420e30ec72b5a4e4f72460e9c