Merge "Populate 'hasKnownUserIntentEmergency' flag"
am: 168fe2f078

Change-Id: I7f1ba516f9593ad2bab51d0d24fc1e2f3e9e60ed