Merge "Populate 'hasKnownUserIntentEmergency' flag" am: a870c25fd9
am: 90c054490b

Change-Id: If9d5d2a3b181238f32ca26d7175e1fc2758adc30