Merge "[automerger skipped] Merge "Add 'hasKnownUserIntentEmergency' into ImsCallProfile Parcel" am: 9102b10a00 am: bd50159ba9 am: 089b142729 -s ours am skip reason: change_id Ie68a02a7e0f9aabe5dbc37806a495169feb63765 with SHA1 0c86fbf491 is in history"