Merge "Populate 'hasKnownUserIntentEmergency' flag"
am: a870c25fd9

Change-Id: Ia4d4925ccadbbdd319ee941f9de93ced930d075b