[automerger skipped] Merge "Populate 'hasKnownUserIntentEmergency' flag" am: a870c25fd9 am: 90c054490b
am: 6e556aec1e -s ours
am skip reason: change_id I81feccc8a2e051ee5d371cbf8c0f56f82c4e1390 with SHA1 721a255991 is in history

Change-Id: I7a49ad3aee66a7801428ce225eec0e3ac1215f4e